Commit Graph

268 Commits

Author SHA1 Message Date
mzl92 cd29507c45 Merge branch 'develop' into feature/mzl_dev 2025-09-18 15:04:59 +08:00
mzl92 9331aa2f36 修改文件路径 2025-09-18 07:04:14 +00:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00:00
18338781771 5fef15b0fa Merge branch 'feature/kpi' 2025-09-18 11:10:11 +08:00
18338781771 c25405832a Merge branch 'hotfix/series' into develop 2025-09-17 18:40:11 +08:00
18338781771 cbc0270ad8 港口英文名 2025-09-17 18:39:12 +08:00
18338781771 78ecf09c1a Merge branch 'hotfix/series' into develop 2025-09-17 15:42:06 +08:00
18338781771 adf617e18b 账户描述 2025-09-17 15:41:59 +08:00
18338781771 5ac1244329 Merge branch 'hotfix/series' into develop 2025-09-17 15:33:34 +08:00
18338781771 9ac777b694 账号描述 2025-09-17 15:33:19 +08:00
18338781771 32d9ce3424 Merge branch 'hotfix/series' into develop 2025-09-17 14:15:37 +08:00
18338781771 3ef45a24c7 品牌推荐 2025-09-17 14:15:09 +08:00
18338781771 5b4842d6e8 Merge branch 'feature/kpi' into develop 2025-09-16 17:54:57 +08:00
18338781771 d70f7c8285 改装项 2025-09-16 14:16:13 +08:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
mzl92 13ecf33dff Merge branch 'develop' into feature/mzl_dev 2025-09-16 10:45:39 +08:00
mzl92 1bb74341d1 增加菜单迁移脚本 2025-09-16 10:45:02 +08:00
18338781771 50fe207ef2 Merge branch 'feature/stock_next' into develop 2025-09-15 17:33:59 +08:00
18338781771 e41be712d3 1 2025-09-15 17:33:34 +08:00
18338781771 6911d2aba2 Merge branch 'feature/stock_next' into develop 2025-09-15 17:27:35 +08:00
18338781771 c24c9af1fd 1 2025-09-15 17:27:26 +08:00
18338781771 1c243ad6ab Merge branch 'feature/stock_next' into develop 2025-09-15 17:10:40 +08:00
18338781771 88bc59ed87 上传可制定名称 2025-09-15 17:10:22 +08:00
mzl92 5ebcc88d96 Merge branch 'develop' into feature/mzl_dev 2025-09-15 16:39:23 +08:00
mzl92 67eaba2687 ts 2025-09-15 16:38:00 +08:00
mzl92 f152529364 消息推送增加邮箱&&增加终版保存功能 2025-09-15 15:01:19 +08:00
18338781771 4222710d94 Merge branch 'develop' into feature/stock_next 2025-09-12 15:15:14 +08:00
18338781771 3ad05165bd 账户增加公司归属 2025-09-12 14:49:36 +08:00
18338781771 9461d41312 Merge branch 'feature/stock_next' into develop
# Conflicts:
#	app/admin/service/VehColorService.php
2025-09-12 14:29:53 +08:00
18338781771 cbb07d1f4c 汽车颜色 2025-09-12 14:25:02 +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 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 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 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 196f16769b Merge branch 'develop' into feature/mzl_dev 2025-09-09 18:02:53 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +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 f5e93f2400 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:47:04 +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