Commit Graph

629 Commits

Author SHA1 Message Date
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 47b68e80dd Merge branch 'master' into develop 2025-09-05 17:01:16 +08:00
mzl92 b399f85707 Finish Hotfix-1 2025-09-05 17:01:14 +08:00
mzl92 66054de8bd 修改邮件询盘时间为半小时拉取 2025-09-05 17:00:52 +08:00
mzl92 7a63b961c2 Merge branch 'master' into develop 2025-09-05 16:56:19 +08:00
mzl92 e79d183516 Finish Hotfix-1 2025-09-05 16:56:18 +08:00
mzl92 9d37048d49 调整邮件询盘脚本 2025-09-05 16:55:57 +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 1a35b7d9a5 Finish mzl_dev 2025-09-04 11:53:33 +08:00
mzl92 e9a3be88af Merge branch 'develop' into feature/mzl_dev 2025-09-04 11:53:19 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +08:00
18338781771 15ba0234e7 询单推送crm队列多余文件删除 2025-09-04 10:36:12 +08:00
mzl92 87679588b4 Finish mzl_dev 2025-09-04 10:27:34 +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 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
18338781771 8ae3dcba6a Merge branch 'develop' into feature/stock_next 2025-09-02 09:47:12 +08:00
mzl92 749cbb6908 Finish mzl_dev 2025-09-02 09:37:38 +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 faed103c1b Merge branch 'master' into develop 2025-09-02 08:55:03 +08:00
mzl92 3d6702646f Finish Hotfix-1 2025-09-02 08:55:02 +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 3640944db7 Merge branch 'master' into develop 2025-09-01 13:47:49 +08:00
mzl92 2e0cd59387 Finish 修正录单报重 2025-09-01 13:47:48 +08:00
mzl92 45de47dd3d 报重修正 2025-09-01 13:47:23 +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