高荣琳
|
e8677e1780
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
5f795b62bc
|
feature:xxl升级2.4.0版本
|
2 years ago |
|
高荣琳
|
582f24f1d8
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
6cdf1b9a8a
|
feature:全电冲红反补
|
2 years ago |
|
高荣琳
|
4693a339ee
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
cb6f4be3af
|
feature:全电冲红反补
|
2 years ago |
|
高荣琳
|
5a96afc91d
|
Merge branch 'dev-dept-tree' into test
|
2 years ago |
|
高荣琳
|
21cd5f348c
|
feature:开票组织返回enterpriseNumbers
|
2 years ago |
wangrangrang
|
13415bcde9
|
Merge remote-tracking branch 'origin/dev-detail-split' into release
|
2 years ago |
|
wangrangrang
|
3f73b37753
|
Merge remote-tracking branch 'origin/dev-sendEmail' into release
|
2 years ago |
|
高荣琳
|
2d69aedd0f
|
Merge branch 'dev-sendEmail' into test
|
2 years ago |
|
高荣琳
|
5aa7356818
|
feature:销项邮件发送协议
|
2 years ago |
|
高荣琳
|
68046dacf4
|
Merge branch 'dev-blbzd' into test
|
2 years ago |
|
高荣琳
|
a33b524911
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
aa0ad76fe6
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
9f4c5de56d
|
Merge branch 'dev-blbzd' into test
|
2 years ago |
|
高荣琳
|
e761cb6405
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
41889a2e8a
|
Merge branch 'dev-blbzd' into test
|
2 years ago |
|
高荣琳
|
7aae09275a
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
f7cc5c7456
|
Merge branch 'dev-blbzd' into test
|
2 years ago |
|
高荣琳
|
cef72872c6
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
15b24331ab
|
Merge branch 'dev-blbzd' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
|
2 years ago |
|
高荣琳
|
818590130d
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
9ab0983ed0
|
feature:补录报账单号
|
2 years ago |
|
wangrangrang
|
371eb3cbc0
|
Merge branch '0906-edit' into test
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
|
2 years ago |
|
wangrangrang
|
1f012bf563
|
注释掉补录报账单后自动回推
|
2 years ago |
|
高荣琳
|
db5d728f0b
|
feature：补录报账单号
|
2 years ago |
|
wangrangrang
|
e4dcf4c11d
|
Merge remote-tracking branch 'origin/0809-findGroup' into release
|
2 years ago |
|
wangrangrang
|
2cf1d714bc
|
Merge remote-tracking branch 'origin/dev-snyx' into test
|
2 years ago |
|
wangrangrang
|
6bffef7181
|
解决冲突
|
2 years ago |
|
wangrangrang
|
d78fddb2ce
|
Merge remote-tracking branch 'origin/dev-snyx' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
|
2 years ago |
|
wangrangrang
|
d66cb1eff2
|
修改系统类型为空导致空指针问题
|
2 years ago |
|
高荣琳
|
874ab95e53
|
feature：开票组织添加公司代码
|
2 years ago |
|
高荣琳
|
9b69029101
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
高荣琳
|
f8ca14a902
|
feature
|
2 years ago |
|
高荣琳
|
d367b86995
|
Merge branch 'dev-FI871' into test
|
2 years ago |
|
高荣琳
|
5eedab27d6
|
feature:FI871 接口
|
2 years ago |
|
gaorl
|
d6f9bbbb69
|
Merge branch 'dev-detail-split' into test
|
2 years ago |
|
gaorl
|
3cbccfcdf7
|
feature:明细行拆分
|
2 years ago |
|
gaorl
|
d90f56ea10
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
5613ec42e0
|
feature：冲红开票
|
2 years ago |
|
gaorl
|
2427cebe9a
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
e287fa1694
|
feature：冲红发票系统来源设置
|
2 years ago |
|
gaorl
|
20a126b0ed
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
0af27e113c
|
feature：冲红发票系统来源设置
|
2 years ago |
|
gaorl
|
3f58b021ec
|
Merge branch 'dev-gmfsh' into test
|
2 years ago |
|
gaorl
|
d8700ce10c
|
feature：购方默认地址电话更新订单
|
2 years ago |
|
gaorl
|
1085760105
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
858af999f1
|
feature：测试修改active
|
2 years ago |
|
gaorl
|
eae4935f0e
|
Merge branch 'dev-gmfsh' into test
|
2 years ago |
