Commit Graph

110 Commits

Author SHA1 Message Date
mzl92 e12d5951e4 修改计å¤备货单金额计算&&采购单编写†2025-09-22 01:55:34 +00:00
mzl92 cd29507c45 Merge branch 'develop' into feature/mzl_dev 2025-09-18 15:04:59 +08:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00: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 e88233229e Merge branch 'hotfix/statistics' into develop 2025-09-16 16:51:53 +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 5ebcc88d96 Merge branch 'develop' into feature/mzl_dev 2025-09-15 16:39:23 +08:00
mzl92 f152529364 消息推送增加邮箱&&增加终版保存功能 2025-09-15 15:01:19 +08:00
18338781771 59b64c4f3c 车辆信息与车辆颜色放到crm端 2025-09-12 15:16:18 +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 ee75d29831 Merge local route changes with remote 2025-09-11 15:30:59 +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 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 7f32a6e7e8 管理端备货单 2025-09-09 18:02:10 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +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
mzl92 8340f678d6 Merge branch 'develop' into feature/mzl_dev 2025-09-08 11:35:45 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
18338781771 259271a7aa kpi相关接口 2025-09-05 09:43:10 +08:00
mzl92 8a4848bc75 新增生成pdf 2025-09-05 09:26:29 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00
mzl92 249b61ddb8 备货单&审批流程 2025-09-04 10:26:28 +08:00
18338781771 2d1e98f25a 统计 2025-09-03 16:10:36 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 4ad408c0b2 客户下拉 2025-09-02 15:42:30 +08:00
18338781771 aa5619f405 字典分类 2025-09-02 14:47:21 +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
mzl92 8fdfd02c81 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/queue/redis/InquiryToCrm.php
#	app/queue/redis/InquiryToCrmUpdate.php
2025-09-01 13:58:12 +08:00
mzl92 847303a8fa 汽车信息基础库 2025-09-01 10:08:51 +08:00
18338781771 a763bfc84c 下拉接口 2025-08-29 17:58:43 +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 149909dd09 车辆颜色 2025-08-28 11:12:27 +08:00
18338781771 db0892f455 品牌 2025-08-28 09:57:46 +08:00