logisticsplatform-service

java_project

Commit Graph

Select branches

Hide Pull Requests

chenglong

dev

dev-pushdata-important

dev-warehouse

dist.1.2.0

dist.1.3.0

master

newStockUp

pre-production

single_db

test

training

visual

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#4

#5

#6

#7

#8

#9

2023-06-06-master-tag

tag1

c0e6c86242 Merge branch 'dev' into pre-production pre-production zhaoqiaobo 2025-01-19 00:14:20 +0800
71e1f0729e 1.报错bug修复 dev zhenghaoyu 2025-01-18 17:57:22 +0800
febe8b7e94 Merge branch 'dev' into pre-production pref_mail@163.com 2025-01-18 17:29:32 +0800
06e2ffe6be 优化签收修改代码优化签收托盘下架 pref_mail@163.com 2025-01-18 17:28:55 +0800
44669e66ef Merge remote-tracking branch 'origin/dev' into dev pref_mail@163.com 2025-01-18 13:54:43 +0800
f2e6e4c12c 调整空数据的显示 chenlong 2025-01-18 13:51:53 +0800
57d44cb5fa 提交大屏的查询 pref_mail@163.com 2025-01-18 11:29:08 +0800
083b9b26a5 Merge remote-tracking branch 'origin/pre-production' master zhenghaoyu 2025-01-18 10:46:55 +0800
db53f69ced Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-18 10:46:31 +0800
2bb567df8d 优化运单查询 pref_mail@163.com 2025-01-18 10:45:49 +0800
45e7d5b6b3 Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-18 10:27:53 +0800
81f9c89a19 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-18 10:27:25 +0800
d97100b65c 优化订单查询 pref_mail@163.com 2025-01-18 10:26:13 +0800
34737924a0 Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-17 22:15:18 +0800
ba1432eaaf feat(all): 金牌工厂 zhaoqiaobo 2025-01-17 22:14:36 +0800
e8ced5dbda Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-17 21:54:03 +0800
f68ddf01de feat(all): 金牌工厂 zhaoqiaobo 2025-01-17 21:53:43 +0800
17b1e70da7 Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-17 21:39:33 +0800
1c468c8814 Merge remote-tracking branch 'origin/dev' into dev zhaoqiaobo 2025-01-17 21:39:02 +0800
d45592a030 feat(all): 金牌工厂 zhaoqiaobo 2025-01-17 21:38:54 +0800
3158426c46 优化签收代码和配送车次状态变更 pref_mail@163.com 2025-01-17 18:15:54 +0800
772c486497 1.bug修复 zhenghaoyu 2025-01-17 18:05:20 +0800
14bb609da9 Merge remote-tracking branch 'origin/dev' into dev zhaoqiaobo 2025-01-17 17:48:33 +0800
2e048071ed feat(all): 干线暂存单 zhaoqiaobo 2025-01-17 17:47:48 +0800
a010b7633d Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-17 11:18:39 +0800
6502233f86 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-17 11:18:01 +0800
229529ad98 Merge remote-tracking branch 'origin/dev' into dev pref_mail@163.com 2025-01-17 10:56:02 +0800
eaa0d97a9c 修复数据查询接口 pref_mail@163.com 2025-01-17 10:55:07 +0800
7e17b6df7d Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-17 10:24:34 +0800
9d9224bf9e 1.bug修复 zhenghaoyu 2025-01-17 10:24:02 +0800
214f78b54d Merge remote-tracking branch 'origin/dev' into dev zhaoqiaobo 2025-01-16 14:04:11 +0800
602a808035 feat(all): 配送报表 zhaoqiaobo 2025-01-16 14:04:06 +0800
60d6485960 1.修改新增客户为7 zhenghaoyu 2025-01-16 11:43:39 +0800
62be90970f fix:修复通知的排序时间 pref_mail@163.com 2025-01-16 09:37:37 +0800
908ea0aa61 Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-16 00:50:05 +0800
251f21e562 feat(all): 索菲亚工厂 zhaoqiaobo 2025-01-16 00:49:43 +0800
03e9e5b3a1 Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-16 00:09:44 +0800
0f96080fd3 修复查询运单报错 pref_mail@163.com 2025-01-15 22:27:12 +0800
f03f0c941c feat(all): 索菲亚工厂 zhaoqiaobo 2025-01-15 18:40:53 +0800
1802537d8a Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-15 17:34:33 +0800
f3f946f204 1.bug修复 zhenghaoyu 2025-01-15 17:23:59 +0800
379442097e 调整大屏的数据 pref_mail@163.com 2025-01-15 15:45:20 +0800
d72f80a66b feat(all): 仓库管理 zhaoqiaobo 2025-01-15 15:09:59 +0800
ac0ee9960f feat(all): 配送模块 zhaoqiaobo 2025-01-15 14:29:24 +0800
4f031b4114 feat(all): 金牌工厂 zhaoqiaobo 2025-01-15 14:20:57 +0800
4e540b6ef5 Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-15 12:12:06 +0800
e2be92eef2 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-15 12:11:45 +0800
e58e828e96 1.服务名称还原 zhenghaoyu 2025-01-15 12:11:29 +0800
2d1390788f Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-15 12:10:46 +0800
3d5030af65 1.；报表逻辑优化 zhenghaoyu 2025-01-15 12:10:09 +0800
7b011bf640 修复打印的制单时间 pref_mail@163.com 2025-01-15 12:02:01 +0800
1f3c993983 feat(all): 配送模块 zhaoqiaobo 2025-01-15 09:59:58 +0800
dde34170f4 Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-15 00:02:48 +0800
1d41110f73 feat(all): 配送模块 zhaoqiaobo 2025-01-14 17:08:21 +0800
2bf7f9b0a2 Merge branch 'pre-production' pref_mail@163.com 2025-01-13 22:42:45 +0800
f3c010b519 Merge remote-tracking branch 'origin/master' pref_mail@163.com 2025-01-13 22:42:35 +0800
105d93b4c7 Merge branch 'dev' into pre-production pref_mail@163.com 2025-01-13 22:42:19 +0800
33a8ec0dd2 Merge remote-tracking branch 'origin/pre-production' into pre-production pref_mail@163.com 2025-01-13 22:42:11 +0800
53ca218426 1.；零担整体时效bug修复 zhenghaoyu 2025-01-13 22:35:09 +0800
a849eed4df Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-13 22:27:36 +0800
6d28ad4493 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-13 22:27:10 +0800
c1620a4182 调试运单查询 4 pref_mail@163.com 2025-01-13 22:25:43 +0800
a33a86d8d6 Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-13 21:51:21 +0800
1c06dfc9a2 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-13 21:50:59 +0800
a406318cf3 调试运单查询 3 pref_mail@163.com 2025-01-13 21:49:55 +0800
b0783d927a Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-13 21:49:20 +0800
0995e6cfe3 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-13 21:48:55 +0800
5baa5e7217 调试运单查询 2 pref_mail@163.com 2025-01-13 21:48:31 +0800
c3fc901c23 Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-13 21:29:01 +0800
94e8e3b523 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-13 21:28:23 +0800
a899e6e4f2 调试运单查询 pref_mail@163.com 2025-01-13 21:26:45 +0800
d2148d638a 修改大屏查询 pref_mail@163.com 2025-01-13 18:26:20 +0800
0ba32a756d Merge branch 'pre-production' pref_mail@163.com 2025-01-13 17:17:31 +0800
ba3b18b817 Merge branch 'dev' into pre-production pref_mail@163.com 2025-01-13 17:17:22 +0800
293421ce8b 修改仓库查询 pref_mail@163.com 2025-01-13 17:17:12 +0800
09eb31ecda Merge branch 'pre-production' pref_mail@163.com 2025-01-13 16:56:36 +0800
bab525efd8 Merge branch 'dev' into pre-production pref_mail@163.com 2025-01-13 16:56:24 +0800
45d57f21dc 修改品牌匹配错误 pref_mail@163.com 2025-01-13 16:56:09 +0800
5b283698c2 Merge branch 'pre-production' pref_mail@163.com 2025-01-13 16:27:26 +0800
c6b2f1df1f Merge branch 'dev' into pre-production pref_mail@163.com 2025-01-13 16:27:01 +0800
cb0b646502 Merge branch 'refs/heads/dev' into chenglong chenlong 2025-01-13 15:33:13 +0800
5e739a47ad 调整空数据的显示 chenlong 2025-01-13 15:32:09 +0800
aa0a682a04 Merge remote-tracking branch 'origin/dev' into dev pref_mail@163.com 2025-01-13 09:23:07 +0800
6c7f13c2a7 修复查询配送数据没有装车数据的时候报错 pref_mail@163.com 2025-01-13 09:22:55 +0800
2927b37e14 Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-10 23:58:08 +0800
03660c12af Merge branch 'dev' into pre-production zhaoqiaobo 2025-01-10 17:28:18 +0800
361c3cdbd3 feat(all): 索菲亚工厂 zhaoqiaobo 2025-01-10 17:27:56 +0800
6cdcede23e Merge remote-tracking branch 'origin/pre-production' zhenghaoyu 2025-01-10 17:02:32 +0800
8e0e574dba Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-10 17:02:04 +0800
7e1e419cb2 修改大屏查询 pref_mail@163.com 2025-01-10 17:01:37 +0800
f16ad0e128 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-10 14:53:02 +0800
af89981d5c 修改名称 pref_mail@163.com 2025-01-10 14:51:48 +0800
f0e6c3c736 Merge branch 'dev_node' into dev pref_mail@163.com 2025-01-10 14:51:10 +0800
96703f60ca Merge branch 'pre-production' pref_mail@163.com 2025-01-10 14:34:10 +0800
9cf25bf409 Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-10 14:29:00 +0800
fff6725875 1.订单整体时效bug修复 zhenghaoyu 2025-01-10 14:27:36 +0800
f37d8320fd Merge remote-tracking branch 'origin/dev' into pre-production zhenghaoyu 2025-01-10 14:08:35 +0800
4d6cffe094 1.干线直发商家签收单新增字段展示 zhenghaoyu 2025-01-10 14:07:12 +0800
2c94fbcc9f Merge remote-tracking branch 'origin/dev' into dev zhaoqiaobo 2025-01-10 11:53:14 +0800
863553e76a feat(all): 金牌工厂 zhaoqiaobo 2025-01-10 11:52:57 +0800