Commit Graph

834 Commits

Author SHA1 Message Date
mzl92 3208fbd501 Finish mzl_dev 2025-09-11 17:14:34 +08:00
mzl92 a89aebd389 Merge branch 'develop' into feature/mzl_dev 2025-09-11 17:14:18 +08:00
mzl92 7e83949ed5 移除废弃代码&&增加管理端备货单查看 2025-09-11 17:13:28 +08:00
mzl92 fe64299303 增加审批签名 2025-09-11 16:52:10 +08:00
mzl92 eb13146763 调整 2025-09-11 15:31:37 +08:00
mzl92 ee75d29831 Merge local route changes with remote 2025-09-11 15:30:59 +08:00
mzl92 7f0f9d1a4f Finish mzl_dev 2025-09-10 18:35:57 +08:00
mzl92 0ab0dd91e0 Merge branch 'develop' into feature/mzl_dev 2025-09-10 18:35:43 +08:00
mzl92 60eb12a151 补充新功能 2025-09-10 18:34:20 +08:00
18338781771 f709f6ac62 Merge branch 'hotfix/crm' into develop 2025-09-10 16:10:57 +08:00
18338781771 e3aaee87f1 客户默认值 2025-09-10 16:09:58 +08:00
18338781771 09576a44fe Merge branch 'feature/stock_next' into develop 2025-09-10 15:02:24 +08:00
18338781771 b120337987 文件删除 2025-09-10 15:02:11 +08:00
18338781771 726e5cf558 Merge branch 'feature/stock_next' into develop 2025-09-10 14:34:37 +08:00
18338781771 e59a690c31 文件删除 2025-09-10 14:33:12 +08:00
mzl92 d2e75525a3 Finish mzl_dev 2025-09-10 13:39:34 +08:00
mzl92 a433b3c1fb Merge branch 'develop' into feature/mzl_dev 2025-09-10 13:39:20 +08:00
mzl92 17efdf01df Merge branch 'develop' into feature/mzl_dev 2025-09-10 13:39:06 +08:00
18338781771 cc4cf55e76 ts 2025-09-10 13:37:45 +08:00
18338781771 3873238a62 ts 2025-09-09 21:07:34 +08:00
mzl92 6f051806a5 Finish mzl_dev 2025-09-09 18:35:22 +08:00
mzl92 7a8c0d6cc3 Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:35:09 +08:00
mzl92 ebd917662b 修改 2025-09-09 18:34:41 +08:00
mzl92 5d853aef30 Finish mzl_dev 2025-09-09 18:03:07 +08:00
mzl92 196f16769b Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:02:53 +08:00
mzl92 7f32a6e7e8 管理端备货单 2025-09-09 18:02:10 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +08:00
18338781771 4f4f5ec074 Merge branch 'feature/stock_next' into develop 2025-09-09 17:24:23 +08:00
18338781771 e2088cc82d 翻译失败原因记录 2025-09-09 17:24:11 +08:00
18338781771 ef0e3edab3 修复合并 2025-09-09 16:59:34 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
18338781771 3dfdf7a73c Merge branch 'feature/stock_next' into develop 2025-09-09 14:55:24 +08:00
18338781771 ed5b21e349 用户列表公司筛选 2025-09-09 14:55:14 +08:00
18338781771 38062d1fb4 Merge branch 'feature/stock_next' into develop 2025-09-09 14:10:08 +08:00
18338781771 1119cc390b 文件上传 2025-09-09 14:09:57 +08:00
mzl92 99a63ff181 Finish mzl_dev 2025-09-09 13:47:32 +08:00
mzl92 feb0512d4e Merge branch 'develop' into feature/mzl_dev 2025-09-09 13:47:18 +08:00
mzl92 f5e93f2400 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:47:04 +08:00
mzl92 df14735715 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:45:46 +08:00
mzl92 663267ce5a Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:44:14 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +08:00
18338781771 2cd613eea6 Merge branch 'feature/stock_next_fanyi' into develop 2025-09-09 11:03:52 +08:00
18338781771 1c45155cf6 港口翻译 2025-09-09 11:03:19 +08:00
mzl92 f3c77c3e05 Finish mzl_dev 2025-09-08 20:02:39 +08:00
mzl92 5dd2925687 Merge branch 'develop' into feature/mzl_dev 2025-09-08 20:02:26 +08:00
mzl92 153443d20f Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-08 20:01:31 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
18338781771 50a795afb7 Merge branch 'feature/stock_next' into develop 2025-09-08 18:03:21 +08:00
18338781771 d6d421cba2 服务器文件上传 2025-09-08 18:03:09 +08:00
18338781771 fe8bce4b4c 翻译 2025-09-08 17:16:00 +08:00