liuyihe
|
9c4512db6a
|
优化
|
2026-10-09 11:48:40 +08:00 |
|
liuyihe
|
c90a191d83
|
优化
|
2026-10-08 20:25:25 +08:00 |
|
liuyihe
|
115461683b
|
优化
|
2026-10-08 20:16:19 +08:00 |
|
liuyihe
|
9c70eab606
|
优化
|
2026-10-08 18:13:43 +08:00 |
|
liuyihe
|
73af3affac
|
restore overseas warehouse navigation entries
|
2026-10-08 15:52:38 +08:00 |
|
liuyihe
|
3c3a7fcd55
|
merge admin frontend changes
|
2026-10-08 15:45:26 +08:00 |
|
liuyihe
|
8fa397bb5e
|
优化
|
2026-10-08 15:34:19 +08:00 |
|
liuyihe
|
34a9861681
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-29 21:01:41 +08:00 |
|
liuyihe
|
f8bddeeaf4
|
merge admin changes into release/test
|
2026-09-29 21:01:37 +08:00 |
|
liuyihe
|
7edc07d235
|
优化
|
2026-09-29 20:52:21 +08:00 |
|
liuyihe
|
86601fd45f
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-28 17:26:28 +08:00 |
|
liuyihe
|
e1b2f5155a
|
优化提交
|
2026-09-28 17:26:26 +08:00 |
|
liuyihe
|
3815eab85e
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-24 08:55:55 +08:00 |
|
liuyihe
|
60eff4f8ab
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-23 11:25:37 +08:00 |
|
liuyihe
|
409d8b3f57
|
贴标优化0923
|
2026-09-23 11:25:23 +08:00 |
|
liuyihe
|
f0ee25ca18
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-22 13:52:10 +08:00 |
|
liuyihe
|
fed257a720
|
优化
|
2026-09-22 13:51:58 +08:00 |
|
liuyihe
|
3b37249c47
|
合并 release/test 管理前端冲突
|
2026-09-22 09:42:02 +08:00 |
|
liuyihe
|
2e2f3ed2d2
|
修改提交
|
2026-09-22 08:47:43 +08:00 |
|
liuyihe
|
be0f712dd6
|
Merge remote-tracking branch 'origin/release/test' into release/test
|
2026-09-20 15:51:48 +08:00 |
|
liuyihe
|
aefcd2565f
|
fix admin frontend build after branch merge
|
2026-09-20 15:50:15 +08:00 |
|
liuyihe
|
940010dcc2
|
merge release test changes and preserve local frontend updates
|
2026-09-20 15:23:26 +08:00 |
|
liuyihe
|
579a4b7353
|
Merge release/test into dev
|
2026-09-17 16:42:02 +08:00 |
|
liuyihe
|
b6a839a3c6
|
优化
|
2026-09-17 16:34:36 +08:00 |
|
liuyihe
|
9c9cb91593
|
优化
|
2026-09-17 13:36:31 +08:00 |
|
liuyihe
|
5d00618c53
|
Merge release/test into dev
|
2026-09-15 15:36:26 +08:00 |
|
liuyihe
|
ea30e3f37a
|
优化
|
2026-09-15 15:20:28 +08:00 |
|
liuyihe
|
01cbe69eb4
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-14 17:07:27 +08:00 |
|
liuyihe
|
604420f07a
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-14 17:06:56 +08:00 |
|
liuyihe
|
c56f60d4ef
|
优化
|
2026-09-14 16:51:35 +08:00 |
|
liuyihe
|
a0e46a05e5
|
优化
|
2026-09-13 21:10:05 +08:00 |
|
liuyihe
|
19fed894d9
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-10 15:33:55 +08:00 |
|
liuyihe
|
aaca62f461
|
优化
|
2026-09-10 15:33:54 +08:00 |
|
liuyihe
|
e428002898
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-09 13:35:45 +08:00 |
|
liuyihe
|
28d97d2221
|
优化提交
|
2026-09-09 13:35:43 +08:00 |
|
liuyihe
|
d55cfb3737
|
merge origin/dev and resolve frontend conflicts
|
2026-09-08 20:33:45 +08:00 |
|
liuyihe
|
c3ae936caa
|
优化
|
2026-09-08 20:27:47 +08:00 |
|
liuyihe
|
b31c37951f
|
优化
|
2026-09-06 18:11:35 +08:00 |
|
liuyihe
|
12e63b1dcb
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-06 15:53:50 +08:00 |
|
liuyihe
|
8029c235e4
|
优化
|
2026-09-06 15:53:48 +08:00 |
|
liuyihe
|
1bc58284a0
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-04 14:50:17 +08:00 |
|
liuyihe
|
bd63c356a6
|
优化
|
2026-09-04 14:50:15 +08:00 |
|
liuyihe
|
3e59898b09
|
优化
|
2026-09-04 14:48:47 +08:00 |
|
liuyihe
|
7db1d12aed
|
优化
|
2026-09-04 14:38:08 +08:00 |
|
liuyihe
|
01925fc134
|
优化
|
2026-09-04 14:36:11 +08:00 |
|
liuyihe
|
86fab2c24e
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-04 14:31:11 +08:00 |
|
liuyihe
|
dd47f3841c
|
优化
|
2026-09-04 14:31:09 +08:00 |
|
liuyihe
|
093c89c058
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-04 11:50:35 +08:00 |
|
liuyihe
|
d5662230d5
|
优化
|
2026-09-04 11:50:34 +08:00 |
|
liuyihe
|
e390b88b6c
|
优化
|
2026-09-04 11:50:22 +08:00 |
|
liuyihe
|
d5ebe6c7e8
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 21:09:42 +08:00 |
|
liuyihe
|
a825060a45
|
优化
|
2026-09-03 21:09:40 +08:00 |
|
liuyihe
|
8f77ad333b
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 17:49:03 +08:00 |
|
liuyihe
|
4ae5598c2d
|
优化
|
2026-09-03 17:49:01 +08:00 |
|
liuyihe
|
afb534d4ee
|
优化
|
2026-09-03 15:10:26 +08:00 |
|
liuyihe
|
65a470cdac
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 15:05:32 +08:00 |
|
liuyihe
|
664d4844c3
|
优化
|
2026-09-03 15:05:30 +08:00 |
|
liuyihe
|
0bf4f5781a
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 14:30:41 +08:00 |
|
liuyihe
|
677a666d9b
|
优化
|
2026-09-03 14:30:39 +08:00 |
|
liuyihe
|
50ca6a6269
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 12:00:08 +08:00 |
|
liuyihe
|
ce1075b9b8
|
优化
|
2026-09-03 12:00:07 +08:00 |
|
liuyihe
|
dd146a09b1
|
优化
|
2026-09-03 11:39:22 +08:00 |
|
liuyihe
|
4f65948347
|
Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test
|
2026-09-03 10:46:15 +08:00 |
|
liuyihe
|
176f815519
|
提交
|
2026-09-03 10:46:07 +08:00 |
|
liuyihe
|
eecf6d8f8a
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-09-02 10:43:45 +08:00 |
|
liuyihe
|
28acf1174a
|
优化
|
2026-09-02 10:43:43 +08:00 |
|
liuyihe
|
c0d6a4eb47
|
优化
|
2026-09-01 10:00:05 +08:00 |
|
liuyihe
|
d0770517dc
|
优化
|
2026-08-31 14:42:28 +08:00 |
|
liuyihe
|
f7328e7c60
|
优化
|
2026-08-31 10:58:12 +08:00 |
|
liuyihe
|
462d02efd5
|
优化
|
2026-08-30 18:50:16 +08:00 |
|
liuyihe
|
9d3862b215
|
优化
|
2026-08-30 16:40:03 +08:00 |
|
liuyihe
|
ea1d06448b
|
恢复尾程订单合托关联展示
|
2026-08-28 16:30:33 +08:00 |
|
liuyihe
|
f7b8159d30
|
移除尾程订单合托标记功能
|
2026-08-28 15:47:13 +08:00 |
|
liuyihe
|
0044c01ed0
|
修正合托关联展示和取消条件
|
2026-08-28 15:32:18 +08:00 |
|
liuyihe
|
d4fc74e601
|
确保尾程列表显示合托字段
|
2026-08-28 15:24:13 +08:00 |
|
liuyihe
|
f6cd60ec61
|
完善尾程订单合托关联与取消操作
|
2026-08-28 15:15:31 +08:00 |
|
liuyihe
|
94a5dfedf6
|
调整尾程订单合托批量标记
|
2026-08-28 14:52:30 +08:00 |
|
liuyihe
|
3525e434a4
|
优化
|
2026-08-28 14:44:53 +08:00 |
|
liuyihe
|
632fc0bdfa
|
解决海外仓前端提交冲突
|
2026-08-28 14:41:40 +08:00 |
|
liuyihe
|
ae48f46c9f
|
优化
|
2026-08-28 14:33:57 +08:00 |
|
liuyihe
|
525c56fdb1
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
# Conflicts:
# src/modules/overseas-warehouse/pages/OutboundsView.vue
|
2026-08-26 15:53:45 +08:00 |
|
liuyihe
|
fac3153472
|
优化
|
2026-08-26 15:48:34 +08:00 |
|
liuyihe
|
d03f7b3f5d
|
优化
|
2026-08-26 11:10:22 +08:00 |
|
liuyihe
|
dcbb6d249f
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-25 20:57:52 +08:00 |
|
liuyihe
|
966fbd1880
|
优化
|
2026-08-25 20:57:51 +08:00 |
|
liuyihe
|
26fcec530f
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-25 14:50:29 +08:00 |
|
liuyihe
|
842cb078fc
|
优化
|
2026-08-25 14:50:27 +08:00 |
|
liuyihe
|
bcdce8ef6c
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-25 10:34:28 +08:00 |
|
liuyihe
|
787ab1c90c
|
优化
|
2026-08-25 10:34:27 +08:00 |
|
liuyihe
|
806afac6a8
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-22 12:24:18 +08:00 |
|
liuyihe
|
866ea58cab
|
优化
|
2026-08-22 12:24:15 +08:00 |
|
liuyihe
|
76c71a3e5e
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-21 18:16:43 +08:00 |
|
liuyihe
|
0e67cb9d65
|
优化
|
2026-08-21 18:16:42 +08:00 |
|
liuyihe
|
b77428b453
|
优化
|
2026-08-21 17:52:07 +08:00 |
|
liuyihe
|
c71753c989
|
Merge branch 'dev' of http://8.163.30.128:10082/html/admin-web into dev
|
2026-08-21 17:20:41 +08:00 |
|
liuyihe
|
c972ad408a
|
优化
|
2026-08-21 17:20:40 +08:00 |
|
liuyihe
|
465be7c8f3
|
合并 admin web 冲突并同步库存接口测试
|
2026-08-21 11:28:39 +08:00 |
|
liuyihe
|
6e9bb6e00c
|
优化
|
2026-08-21 11:20:09 +08:00 |
|
liuyihe
|
595c998214
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-20 18:27:39 +08:00 |
|
liuyihe
|
9ac4495632
|
合并海外仓入库预约与真实接口改动
|
2026-08-20 18:27:30 +08:00 |
|