pref_mail@163.com
|
cd519d00b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
pref_mail@163.com
|
291453b4df
|
1.合并线上代码
|
1 year ago |
zhenghaoyu
|
0c04471562
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
9ef6866abb
|
1.验证工厂token打印日志改为error级别
|
1 year ago |
0.0
|
625fba30d3
|
1.修改货位qrcode
|
1 year ago |
|
zhenghaoyu
|
9ef3a1d872
|
1.所有带托盘的地方加上托盘名称
|
1 year ago |
|
pref_mail@163.com
|
b3b08d85f5
|
Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
# blade-example-api/blade-dubbo-provider-api/pom.xml
# blade-example-api/pom.xml
# blade-example/blade-dubbo-consumer/pom.xml
# blade-example/blade-dubbo-provider/pom.xml
# blade-example/blade-easypoi/pom.xml
# blade-example/blade-mq-kafka/pom.xml
# blade-example/blade-mq-rabbit/pom.xml
# blade-example/blade-sharding-jdbc/pom.xml
# blade-example/blade-sharding-jdbc/src/main/java/org/springblade/sharding/config/ShardingConfiguration.java
# blade-example/blade-sharding-jdbc/src/main/resources/application-prod.yml
# blade-example/blade-sharding-jdbc/src/main/resources/application-test.yml
# blade-example/blade-stream-consumer/pom.xml
# blade-example/blade-websocket/pom.xml
# blade-example/pom.xml
# blade-service-api/logpm-basicdata-api/pom.xml
# blade-service-api/logpm-factory-api/pom.xml
# blade-service/logpm-aftersales/pom.xml
# blade-service/logpm-aftersales/src/main/resources/liteflow/demo.el.xml
# blade-service/logpm-basic/pom.xml
# blade-service/logpm-basic/src/main/java/com/logpm/basic/LiteFlowTest.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPdaClient.java
# blade-service/logpm-statisticsdata/pom.xml
# blade-service/logpm-trunkline/pom.xml
# blade-service/pom.xml
# pom.xml
|
1 year ago |
|
zhenghaoyu
|
6522adb9ac
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
f87bd1dc5f
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
b470ce1061
|
1.工厂token验证问题 尝试性提交
|
1 year ago |
|
zhenghaoyu
|
742f41f777
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
dac5bb4ac9
|
Merge branch 'dev' into pre-production
|
1 year ago |
‘chaoosc’
|
1f6b108542
|
1.查询推送失败的原因
|
1 year ago |
|
zhenghaoyu
|
8e3c07fa67
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
c73cb05fce
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
2b658d8eb2
|
1.同步老系统盘点任务bug修复
|
1 year ago |
 caoyizhong
|
89097291f7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
44f3c27907
|
修改包件转库存品
|
1 year ago |
|
zhenghaoyu
|
689c12aede
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
c5f7418da6
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
931f1bb0a6
|
1.拉取订单数据还原
|
1 year ago |
|
‘chaoosc’
|
7f3a4f9f97
|
1.增加配送单取消任务后的报错判断
|
1 year ago |
|
zhenghaoyu
|
19d68ea6d6
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
f4387e9965
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
3cb6da65c1
|
1.老系统同步盘点任务数据列表排序提交
|
1 year ago |
|
caoyizhong
|
09fa2152ec
|
修改包件转库存品
|
1 year ago |
kilo
|
2e67324176
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
kilo
|
74a4cd1d17
|
PDA零担装车
|
1 year ago |
|
caoyizhong
|
f0e705d7d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
88a3a6dbca
|
修改包件转库存品
|
1 year ago |
|
zhenghaoyu
|
8f75c6bd82
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
c15077718b
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
19487df1ad
|
1.同步老系统盘点任务代码提交,已完成
2.老系统扫描倒车入库推送订单拉取托盘信息
|
1 year ago |
|
caoyizhong
|
e48c480c69
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
234d0e3dd2
|
修改市配打印不对
|
1 year ago |
|
zhenghaoyu
|
8007ddde8d
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
cedba19d8a
|
1.同步老系统盘点任务部分代码提交
|
1 year ago |
|
zhenghaoyu
|
69b48fc500
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
7e91a6969e
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
a6fd571ba9
|
1.同步盘点任务数据提交
|
1 year ago |
|
caoyizhong
|
34812f04a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
9c8449ee91
|
修改自提零担查询
|
1 year ago |
|
zhenghaoyu
|
39e8089f7f
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
691aa54c34
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
89c9d873c7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
zhenghaoyu
|
caceb13569
|
1.同步数据bug修复
|
1 year ago |
|
‘chaoosc’
|
a0b2a0bbc1
|
1.修改叉车
|
1 year ago |
|
zhenghaoyu
|
ca1140b556
|
Merge branch 'pre-production'
|
1 year ago |
|
zhenghaoyu
|
95f691decf
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
7feeb8fe20
|
1.同步数据bug修复
|
1 year ago |
