Commit Graph

62 Commits

Author SHA1 Message Date
18338781771 48bd9c516d 编码自动化 2025-09-16 09:49:16 +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 17efdf01df Merge branch 'develop' into feature/mzl_dev 2025-09-10 13:39:06 +08:00
mzl92 ebd917662b 修改 2025-09-09 18:34:41 +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 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
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 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
18338781771 fe8bce4b4c 翻译 2025-09-08 17:16:00 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
18338781771 bc8c15a3a9 翻译 2025-09-08 10:37:06 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
18338781771 005bc4e2e6 货币 2025-09-02 17:02:03 +08:00
18338781771 4ad408c0b2 客户下拉 2025-09-02 15:42:30 +08:00
18338781771 36f9c82c8b 分类 2025-09-02 15:07:35 +08:00
18338781771 34f2284911 字典分组 2025-09-02 14:59:11 +08:00
18338781771 aa5619f405 字典分类 2025-09-02 14:47:21 +08:00
18338781771 c1fb484e24 字典分类 2025-09-02 13:59:48 +08:00
18338781771 223b952742 字典分类 2025-09-02 13:54:21 +08:00
18338781771 da3e5e2a2d Merge branch 'feature/stock_next' into develop
# Conflicts:
#	app/admin/controller/SysDictController.php
#	app/admin/controller/VehColorController.php
#	app/admin/service/SysDictService.php
#	app/common/model/SysCurrency.php
#	app/controller/IndexController.php
#	config/route.php
2025-09-02 11:55:14 +08:00
18338781771 935caa24f2 字典分类 2025-09-02 11:46:02 +08:00
mzl92 7ded55ca0e 增加全量范围字典查询 2025-09-01 17:08:02 +08:00
mzl92 b3d8029e6d Merge branch 'develop_bm' into feature/mzl_dev
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-09-01 14:06:34 +08:00
18338781771 87728793c2 港口 2025-08-28 16:01:41 +08:00
18338781771 df8a47c947 账户 2025-08-28 15:19:39 +08:00
18338781771 035450e762 改装 2025-08-28 14:04:58 +08:00
18338781771 3bb2d93b83 品牌logo 2025-08-28 11:18:53 +08:00
18338781771 149909dd09 车辆颜色 2025-08-28 11:12:27 +08:00
18338781771 db0892f455 品牌 2025-08-28 09:57:46 +08:00
18338781771 280c26983f 货币 2025-08-27 17:39:59 +08:00
18338781771 b751975e3f 数据格式化 2025-08-27 16:43:30 +08:00
18338781771 989bf299b5 1 2025-08-27 15:31:25 +08:00
18338781771 60dcc3399f 用户修改 2025-08-21 14:02:28 +08:00
18338781771 e7cf1dce94 用户筛选 2025-08-20 09:40:52 +08:00
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
18338781771 12490242c4 组员客户 2025-08-08 17:51:08 +08:00