zhaoqiaobo
|
97f138f05a
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
733c3612aa
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
e677826434
|
feat(all): 修改售后异常工单保存问题
|
8 months ago |
 pref_mail@163.com
|
ca8b5a05eb
|
重构商家端
|
8 months ago |
|
pref_mail@163.com
|
417167efaa
|
Merge branch 'dev' into 商家2.1
# Conflicts:
# blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
|
8 months ago |
zhenghaoyu
|
4165711c90
|
1.入库逻辑优化
|
8 months ago |
|
pref_mail@163.com
|
d0279a35d3
|
重构商家端
|
8 months ago |
|
zhaoqiaobo
|
c53a0c7c72
|
feat(all): 增加我乐自定义数据推送
|
8 months ago |
|
zhaoqiaobo
|
7df48d0a38
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
c81811d187
|
feat(all): 增加我乐自定义数据推送
|
8 months ago |
|
zhaoqiaobo
|
ff16d043e9
|
feat(all): 增加我乐自定义数据推送
|
8 months ago |
|
pref_mail@163.com
|
a57d4fd4c1
|
增加商家端模块
|
8 months ago |
|
zhaoqiaobo
|
8eaedec9e2
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
fbbffe8d16
|
feat(all): 解决售后异常工单修改不正确问题
|
8 months ago |
|
zhaoqiaobo
|
c8528f42cb
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
14e59ccdc0
|
feat(all): 解决售后异常工单修改不正确问题
|
8 months ago |
|
zhaoqiaobo
|
c48caeb174
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
ec0b1d2179
|
feat(all): 解决售后异常工单修改不正确问题
|
8 months ago |
|
zhaoqiaobo
|
33d426e39d
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
3e61c02062
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhenghaoyu
|
5908c563c7
|
1.结算功能模块更新
|
8 months ago |
|
zhaoqiaobo
|
e3a9f8757a
|
feat(all): 解决售后异常工单修改不正确问题
|
8 months ago |
 汤建军
|
f3514792c4
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
967afbfd5f
|
签收增加日志打印
|
8 months ago |
|
汤建军
|
33f9eea9a8
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
49b6f24e93
|
签收增加日志打印
|
8 months ago |
|
汤建军
|
8806f99658
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
f53dcc0ab8
|
签收增加日志打印
|
8 months ago |
|
汤建军
|
a4127112df
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
汤建军
|
9c8684dd03
|
节点信息、工单BUG修复
|
8 months ago |
|
zhaoqiaobo
|
8b990733f9
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
c1cd89f1a3
|
feat(all): 解决我乐启动报错问题
|
8 months ago |
|
pref_mail@163.com
|
303253cce7
|
Merge remote-tracking branch 'origin/pre-production' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
59d88148ff
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
pref_mail@163.com
|
433b5c2abd
|
Merge branch 'dev' into 商家2.1
# Conflicts:
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
# blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
|
8 months ago |
|
zhaoqiaobo
|
944f900183
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
8dc3e52ba1
|
feat(all): 修改志邦推送数据报错问题
|
8 months ago |
|
zhaoqiaobo
|
c9e7345298
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
8cdf65525b
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
c23154e7f5
|
feat(all): 增加我乐配送节点数据推送
|
8 months ago |
|
zhenghaoyu
|
5943dc63f0
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhenghaoyu
|
41fc4c8666
|
1.结算bug修复
|
8 months ago |
|
pref_mail@163.com
|
a7d453a0aa
|
增加商家数据推送
|
8 months ago |
|
汤建军
|
8f986474ca
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhenghaoyu
|
548f6fab19
|
1.bug修复
|
8 months ago |
|
zhaoqiaobo
|
ee2002780e
|
Merge branch 'dev' into pre-production
|
8 months ago |
|
zhaoqiaobo
|
04fe6c0862
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
zhaoqiaobo
|
5e3fb189ce
|
feat(all): 修改售后申述自己看不到自己的单子问题
|
8 months ago |
|
汤建军
|
6a01e1d8ca
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 months ago |
|
汤建军
|
c50317c4fa
|
PDA自提备货列表BUG修复
|
8 months ago |
