Commit Graph

50 Commits

Author SHA1 Message Date
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00: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 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 eb13146763 调整 2025-09-11 15:31:37 +08:00
mzl92 60eb12a151 补充新功能 2025-09-10 18:34:20 +08:00
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 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 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 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 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 476921e6b8 备货单 2025-09-02 09:36:37 +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 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
mzl92 8e647d80af 修正离职人员关联的询单 2025-08-22 18:27:47 +08:00
mzl92 11165fcfb9 Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34' 2025-08-22 18:16:13 +08:00
mzl92 dac360ec65 Merge branch 'develop' 2025-08-19 13:54:19 +08:00
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
mzl92 a315ad33f1 Merge branch 'feature/mzl_dev'
# Conflicts:
#	app/command/TbCommand.php
#	app/common/utils/email/Emails.php
#	app/controller/IndexController.php
#	app/functions.php
2025-08-04 18:11:44 +08:00
mzl92 b2d4119e46 Merge branch 'feature/mzl_dev' 2025-08-04 14:03:57 +08:00
mzl92 d74b374198 Merge branch 'develop' 2025-07-29 09:00:04 +08:00
mzl92 72878f49ea Merge commit 'acd428f57bceb73ddc770cc6b59f8be7a237af90' 2025-07-14 10:08:29 +08:00
mzl92 925c5501f7 Merge branch 'develop' 2025-07-11 18:01:23 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00