Commit Graph

863 Commits

Author SHA1 Message Date
18338781771 1bc308b359 Merge branch 'hotfix/series' into develop 2025-09-16 15:09:48 +08:00
18338781771 a2518025f6 公司不要默认值 2025-09-16 15:09:31 +08:00
18338781771 09cec1ee8b Merge branch 'hotfix/series' into develop
# Conflicts:
#	config/route.php
2025-09-16 14:16:53 +08:00
18338781771 d70f7c8285 改装项 2025-09-16 14:16:13 +08:00
18338781771 afa84c9823 车系编码 2025-09-16 12:04:12 +08:00
18338781771 44844cf0e3 Merge branch 'feature/stock_next' into develop 2025-09-16 11:43:05 +08:00
18338781771 8b48011eb7 车系编码 2025-09-16 11:42:58 +08:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
mzl92 e096ae8e34 Finish mzl_dev 2025-09-16 10:45:49 +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 af254e3b27 Merge branch 'feature/stock_next' into develop 2025-09-16 09:49:24 +08:00
18338781771 48bd9c516d 编码自动化 2025-09-16 09:49:16 +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
18338781771 4b1b17b0fc 统计 2025-09-15 16:47:37 +08:00
mzl92 0b87b688fe Finish mzl_dev 2025-09-15 16:39:33 +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 59b64c4f3c 车辆信息与车辆颜色放到crm端 2025-09-12 15:16:18 +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 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