Commit Graph

116 Commits

Author SHA1 Message Date
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +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
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
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
mzl92 7a63b961c2 Merge branch 'master' into develop 2025-09-05 16:56:19 +08:00
mzl92 9d37048d49 调整邮件询盘脚本 2025-09-05 16:55:57 +08:00
18338781771 efb4cde4f1 1 2025-09-05 16:26:34 +08:00
mzl92 8a4848bc75 新增生成pdf 2025-09-05 09:26:29 +08:00
mzl92 ea38afff9a 备货单完善 2025-09-04 18:22:24 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +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 c0a0c1c5d3 上传 2025-09-03 11:35:36 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
mzl92 6a1ab1f5c3 增加备货单 2025-09-02 17:22:56 +08:00
18338781771 a3d39feace 货币下拉 2025-09-02 17:14:11 +08:00
18338781771 005bc4e2e6 货币 2025-09-02 17:02:03 +08:00
18338781771 4ad408c0b2 客户下拉 2025-09-02 15:42:30 +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
18338781771 8ae3dcba6a Merge branch 'develop' into feature/stock_next 2025-09-02 09:47:12 +08:00
mzl92 9c0bb434c9 Merge branch 'develop' into feature/mzl_dev 2025-09-02 09:37:23 +08:00
mzl92 476921e6b8 备货单 2025-09-02 09:36:37 +08:00
mzl92 00bc346b87 修改邮件自动发送的消息推送 2025-09-02 08:54:37 +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 29f573a467 st 2025-09-01 14:00:44 +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
18338781771 280c26983f 货币 2025-08-27 17:39:59 +08:00
18338781771 b176c01f54 crm客户所属公司字段优化 2025-08-27 15:39:47 +08:00
18338781771 989bf299b5 1 2025-08-27 15:31:25 +08:00
18338781771 e031c6dbd5 客户重复通知 2025-08-26 09:29:46 +08:00
mzl92 6730f11cca tz 2025-08-23 16:52:08 +08:00
mzl92 8e647d80af 修正离职人员关联的询单 2025-08-22 18:27:47 +08:00
mzl92 11165fcfb9 Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34' 2025-08-22 18:16:13 +08:00