Commit Graph

103 Commits (ee2d0377f9cc4d7de2ac058574c6b78935bbfee5)

Author SHA1 Message Date
wangchaoxu 29334cdef3 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
1 year ago
wangchaoxu 22af68a24f 采购单同步 1 year ago
daixiaogang 0db685e01d 分销订单列表返回体添加参数 1 year ago
daixiaogang a43168f550 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang c4f395a79e 售后订单同步部分 1 year ago
ljl ec1ded0249 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl a03ec54560 yh 1 year ago
daixiaogang c50e2698bd Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 6eecf46320 售后订单同步部分 1 year ago
cxxxxxxx详 3ef05fe5e6 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 f9ffc59221 铺货单字段补充 1 year ago
laolin f6545a6675 物流代码提交-物流公司列表接口 1 year ago
ljl ca244ec7fb Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl bdbb74495f 修改 1 year ago
daixiaogang c5bb70e9f4 售后订单同步部分 1 year ago
daixiaogang 48fee6bf49 售后订单同步相关表生成 1 year ago
daixiaogang 6d023b12b0 检查订单同步是否结束 1 year ago
daixiaogang cc77d4293a 指定时间同步订单数据 1 year ago
cxxxxxxx详 505c7b0edd 铺货单相关修改 1 year ago
daixiaogang c933eb9b29 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 400df9433f 获取分销订单各个tab的订单数量 1 year ago
cxxxxxxx详 ea3f08df99 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 5b7143847a 铺货单相关修改 1 year ago
daixiaogang 48733fe8af Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
#	ms-dal/src/main/java/com/ms/dal/mapper/PurchaseOrderMapper.java
#	ms-dal/src/main/resources/mapper/PurchaseOrderMapper.xml
1 year ago
daixiaogang badb1afbaf 获取分销订单各个tab的订单数量 1 year ago
ljl a8e5c1cd42 解决冲突 1 year ago
ljl 4f0b783a38 yh 1 year ago
laolin fd7b56909d 物流代码提交-代码被覆盖-重提交 1 year ago
laolin f54c90bf3d 物流代码提交 1 year ago
laolin 8fc98ad733 物流代码提交 1 year ago
laixiongwei 81d9d68705 批量取消订单隔离\批量设置订单隔离 1 year ago
laixiongwei 3cf281f243 订单出库(手动出库) 1 year ago
wangchaoxu a7968fef17 采购配置相关 1 year ago
wangchaoxu cf5a1035d3 采购配置相关 1 year ago
wangchaoxu 245743bb36 采购配置相关 1 year ago
cxxxxxxx详 6ea372d64c Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 a2fab03d3a 商品接口修改 1 year ago
wangchaoxu 8539e7e26c Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 68ca78658d 采购配置相关 1 year ago
laixiongwei 6a341a51e6 Merge remote-tracking branch 'origin/master' 1 year ago
laixiongwei 4481b60399 添加表 1 year ago
wangchaoxu 15280d0935 采购配置相关 1 year ago
ljl 8c34fb1c81 解决冲突 1 year ago
ljl d2763957a8 采购 1 year ago
daixiaogang 923d564e2c 合并问题处理 1 year ago
daixiaogang e14280c2f6 合并问题处理 1 year ago
daixiaogang 37842ab598 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
#	ms-dal/src/main/resources/mapper/OpOrderPurchaseOutstorageQueueMapper.xml
1 year ago
daixiaogang 10a5cb2d4d 抖店订单同步、列表查询 1 year ago
laixiongwei 7a4b5cf196 修改xml 1 year ago
wangchaoxu a58826e306 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago