王琦
|
03dc52108b
|
Merge branch '瑞丰相关接口改造' into test
# Conflicts:
# order-management-consumer/src/main/resources/bootstrap-test.yaml
|
2 years ago |
|
王琦
|
930a152909
|
瑞丰相关接口改造
|
2 years ago |
|
王琦
|
0cbdf23b91
|
Merge remote-tracking branch 'origin/dev-jdc' into test
|
2 years ago |
高荣琳
|
e81efc7f93
|
feature:机动车开票
|
2 years ago |
|
高荣琳
|
0e5e3eea61
|
feature:机动车开票
|
2 years ago |
wangrangrang
|
6b58b40e89
|
Merge branch 'feature/eidt_gsclientTask' into test
|
2 years ago |
|
wangrangrang
|
b4079f431a
|
添加注释
|
2 years ago |
|
wangrangrang
|
c014ef49fe
|
去掉回滚测试
|
2 years ago |
|
wangrangrang
|
1cf51f2398
|
测试回滚
|
2 years ago |
|
wangrangrang
|
d783b0426f
|
测试回滚
|
2 years ago |
|
wangrangrang
|
c19f854a41
|
Merge branch 'feature/eidt_gsclientTask' into test
|
2 years ago |
|
wangrangrang
|
e55b22e988
|
修改gsClient定时任务中的事务隐患
|
2 years ago |
|
wangrangrang
|
cb6a6423c5
|
Merge remote-tracking branch 'origin/openRedInvoice' into test
# Conflicts:
# order-management-consumer/pom.xml
|
2 years ago |
路明慧
|
15f621d751
|
红字发票开具根据报账单号查询订单过程表时添加订单状态为有效
|
2 years ago |
|
wangrangrang
|
aea1fa3c82
|
修改提示
|
2 years ago |
|
wangrangrang
|
430bd4a4af
|
split改版本
|
2 years ago |
|
wangrangrang
|
a14e3f5c56
|
改为test快照版本
|
2 years ago |
|
wangrangrang
|
7912aa5c39
|
Merge branch 'feature/edit_danjian_length' into test
|
2 years ago |
|
wangrangrang
|
0a2857fdd2
|
升级版本 ，解决手工开全电项目单价为15的问题 改为13位
|
2 years ago |
|
王琦
|
6c3877d2d8
|
Merge branch '瑞丰相关接口改造' into test
|
2 years ago |
|
王琦
|
8839838652
|
瑞丰相关接口改造
|
2 years ago |
|
wangrangrang
|
a8953032b3
|
Merge remote-tracking branch 'origin/dev-blfp' into test
|
2 years ago |
|
wangrangrang
|
714ae3e325
|
补录报账单号 ,更新订单号
|
2 years ago |
|
wangrangrang
|
aa14a7bf2c
|
Merge remote-tracking branch 'origin/dev-tsyx' into release
|
2 years ago |
|
wangrangrang
|
0066a0bac2
|
Merge branch 'feature/update_bankInfo' into release
|
2 years ago |
|
wangrangrang
|
b825fa3e2f
|
Merge remote-tracking branch 'origin/dev-blfp' into test
|
2 years ago |
|
wangrangrang
|
7640037f9f
|
补录报账单号 更新公司代码
|
2 years ago |
|
wangrangrang
|
97f25e7529
|
Merge remote-tracking branch 'origin/feature/update_bankInfo' into test
|
2 years ago |
|
wangrangrang
|
f0d34e3399
|
更新银行账号详情
|
2 years ago |
|
wangrangrang
|
aa7e893fdf
|
Merge remote-tracking branch 'origin/feature/debugToInfo' into test
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java
|
2 years ago |
|
wangrangrang
|
d6f9a8f039
|
log.debug改为log.info
|
2 years ago |
|
wangrangrang
|
e9c4ed4523
|
Merge remote-tracking branch 'origin/dev-djjy' into release
|
2 years ago |
|
wangrangrang
|
9333130562
|
Merge remote-tracking branch 'origin/dev-hzxz' into test
|
2 years ago |
|
高荣琳
|
16a527f4fe
|
feature:红字下载日志级别修改
|
2 years ago |
|
高荣琳
|
2a2d752f0b
|
feature:红字下载返回没有需要同步的申请单数据
|
2 years ago |
|
wangrangrang
|
faf5b43dfb
|
Merge remote-tracking branch 'origin/dev-djjy' into test
|
2 years ago |
|
高荣琳
|
8463daee91
|
feature:SAP 接口开票单价传0 转换
|
2 years ago |
|
wangrangrang
|
10bd737554
|
Merge remote-tracking branch 'origin/dev-dlcf' into test
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
|
2 years ago |
|
wangrangrang
|
8bccb39658
|
log.debug改为log.info
|
2 years ago |
|
wangrangrang
|
36f3e02e10
|
Merge remote-tracking branch 'origin/dev-dlcf' into test
|
2 years ago |
|
高荣琳
|
94292e0621
|
feature:等量拆分问题处理
|
2 years ago |
|
高荣琳
|
1722b89f50
|
Merge branch 'dev-tsyx' into test
|
2 years ago |
|
高荣琳
|
9513094efd
|
feature:推送影像JSON报错
|
2 years ago |
|
wangrangrang
|
d4e986ec54
|
Merge remote-tracking branch 'origin/dev-split' into release
|
2 years ago |
|
wangrangrang
|
dc5ec54516
|
Merge remote-tracking branch 'origin/dev-hzfpxf' into release
|
2 years ago |
|
高荣琳
|
68c5bf1181
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
f33ac89f3e
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
2764326525
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
3b0826cec7
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
c17bb59d66
|
Merge branch 'dev-blfp' into test
|
2 years ago |
