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 |
|
高荣琳
|
b99317650d
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
fa7d5d67f1
|
Merge branch 'dev-split' into test
|
2 years ago |
|
高荣琳
|
bc62fe9aea
|
feature:订单拆分ukey、税控盘拆分最后一笔订单小于1分钱需要重新计算
|
2 years ago |
|
高荣琳
|
abc9ff6400
|
Merge branch 'dev-split' into test
|
2 years ago |
|
高荣琳
|
e0c5894260
|
feature:订单拆分ukey、税控盘拆分最后一笔订单小于1分钱需要重新计算
|
2 years ago |
|
高荣琳
|
b40800fcd6
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
0552e5d5d5
|
feature:补录报账单
|
2 years ago |
王琦
|
a16b3ae83f
|
Merge remote-tracking branch 'origin/dev-dept-tree' into release
|
2 years ago |
|
王琦
|
47cbd5a2de
|
Merge remote-tracking branch 'origin/dev-FI871' into release
|
2 years ago |
|
高荣琳
|
e7af377bf6
|
feature:xxl升级添加日志
|
2 years ago |
|
高荣琳
|
b7c883a369
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
3345486631
|
feature: 同步开票中数据定时任务
|
2 years ago |
|
高荣琳
|
2de014fdb1
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
1bf6b94feb
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
53259934c6
|
feature:定时任务问题
|
2 years ago |
|
高荣琳
|
ca49fa8786
|
feature: 补录报账单号
|
2 years ago |
|
高荣琳
|
8a3d17490f
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
6eb36dfe79
|
feature:xxl 2.4.0定时任务传参
|
2 years ago |
|
高荣琳
|
79556cd428
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
aa7581a386
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
448ab80a1f
|
feature:补录报账单号
|
2 years ago |
|
高荣琳
|
84301eb379
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
0aab8bcef5
|
feature:补录报账单
|
2 years ago |
|
高荣琳
|
98af9e2f92
|
Merge branch 'dev-blfp' into test
|
2 years ago |
|
高荣琳
|
b4b51c8288
|
feature: 补录报账单号提示
|
2 years ago |
|
高荣琳
|
ff2d48eb7b
|
feature:定时任务
|
2 years ago |
|
高荣琳
|
1f8ca7920a
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
|
高荣琳
|
47fbd69642
|
feature:升级xxl
|
2 years ago |
|
高荣琳
|
cf1118678d
|
Merge branch 'dev-hzfpxf' into test
|
2 years ago |
