Commit Graph
81 Commits
Author SHA1 Message Date
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
ouyangxq 2dc357e55b Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-08 17:03:10 +08:00
ouyangxq fbdb7b6c01 优化 2026-09-08 14:07:39 +08:00
ouyangxq 8ccfb9eea4 优化 2026-09-07 15:34:48 +08:00
ouyangxq d488e9ab40 优化 2026-09-07 15:07:39 +08:00
ouyangxq bc6629d400 fix: align loading and weight acceptance 2026-09-04 16:28:44 +08:00
ouyangxq 871d0a56b9 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
2026-09-04 16:21:32 +08:00
ouyangxq ac96249f7d 优化 2026-09-04 15:19:48 +08:00
ouyangxq 44eb8d17f2 优化 2026-09-04 14:41:29 +08:00
ouyangxq 7d29f3d7ea docs: align application scope and merge contracts 2026-09-04 12:41:58 +08:00
ouyangxq 864a3c3cc7 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
#	src/modules/domestic-containers/pages/DomesticContainersView.vue
2026-09-04 12:35:34 +08:00
ouyangxq 7f7c84d404 优化 2026-09-04 10:51:31 +08:00
ouyangxq d90a5db1c4 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-03 18:22:05 +08:00
ouyangxq e2b0102fdb 优化 2026-09-03 18:05:38 +08:00
ouyangxq b7985f4a6d Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	AGENTS.md
2026-09-03 11:02:21 +08:00
ouyangxq 6270573095 优化 2026-09-02 20:49:19 +08:00
ouyangxq f0801c2774 docs: register finance allocation routes 2026-09-02 20:32:42 +08:00
ouyangxq f281268efe 优化 2026-09-02 18:03:45 +08:00
ouyangxq e31ba2c5a5 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/overseas-warehouse/pages/DispatchesView.vue
#	src/modules/overseas-warehouse/pages/OutboundsView.vue
#	src/modules/overseas-warehouse/pages/PalletDetailView.vue
2026-09-02 15:23:05 +08:00
ouyangxq 602674573c 优化 2026-09-02 15:15:47 +08:00
ouyangxq b3e6971ea8 优化 2026-09-02 14:50:52 +08:00
ouyangxq b5b4b41b99 Merge remote-tracking branch 'origin/release/test' into dev
# Conflicts:
#	src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue
#	src/modules/overseas-warehouse/pages/DispatchesView.vue
#	src/modules/overseas-warehouse/pages/OutboundsView.vue
2026-09-02 14:47:03 +08:00
ouyangxq 637b202559 优化 2026-09-02 14:39:34 +08:00
ouyangxq f75e08c1bb Merge remote-tracking branch 'origin/release/test' into dev 2026-09-02 14:01:30 +08:00
ouyangxq 776c0e2ebb 优化 2026-09-02 11:59:59 +08:00
ouyangxq 490b685f3a Merge remote-tracking branch 'origin/release/test' into dev 2026-09-02 10:34:07 +08:00
ouyangxq 29b937989a 优化 2026-09-01 20:07:40 +08:00
ouyangxq 5706645032 优化 2026-09-01 16:18:56 +08:00
ouyangxq 519ce1dc96 优化 2026-09-01 14:46:47 +08:00
ouyangxq 76604da31b 优化 2026-09-01 14:27:22 +08:00
ouyangxq 62a016a2f8 优化 2026-09-01 10:29:17 +08:00
ouyangxq 0f4f635686 优化 2026-08-31 18:55:15 +08:00
ouyangxq cee0464e69 feat(admin): show inbound business relationships 2026-08-30 17:46:45 +08:00
ouyangxq ae52141952 优化 2026-08-30 17:43:03 +08:00
ouyangxq de81a16ceb 优化 2026-08-28 17:10:16 +08:00
ouyangxq 251645d2d8 优化 2026-08-28 13:54:44 +08:00
ouyangxq 929f50dc55 优化 2026-08-27 17:16:38 +08:00
ouyangxq 7b50e92baf 优化 2026-08-26 17:29:11 +08:00
ouyangxq 6d4748c62a 优化 2026-08-26 15:59:01 +08:00
ouyangxq c38e538a95 优化 2026-08-26 11:10:48 +08:00
ouyangxq 3545ffa522 优化 2026-08-25 16:40:44 +08:00
ouyangxq d5a23a7c65 优化 2026-08-25 15:08:31 +08:00
ouyangxq a4f2a9b8a7 优化 2026-08-22 09:56:34 +08:00
ouyangxq 53deccc0c4 优化 2026-08-21 17:19:54 +08:00
ouyangxq 0428b8af75 优化 2026-08-20 19:55:26 +08:00
ouyangxq 508f76924e 优化 2026-08-20 09:10:36 +08:00
ouyangxq 033b5df6b6 优化 2026-08-19 17:08:45 +08:00
ouyangxq 65cd9ecefa 优化 2026-08-19 16:45:51 +08:00
ouyangxq d1de19dc82 优化 2026-08-19 10:00:50 +08:00