Commit Graph

50 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
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 9c0bb434c9 Merge branch 'develop' into feature/mzl_dev 2025-09-02 09:37:23 +08:00
mzl92 00bc346b87 修改邮件自动发送的消息推送 2025-09-02 08:54:37 +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 b176c01f54 crm客户所属公司字段优化 2025-08-27 15:39:47 +08:00
mzl92 b15c03f009 Merge branch 'develop' 2025-08-25 16:39:48 +08:00
mzl92 6730f11cca tz 2025-08-23 16:52:08 +08:00
mzl92 11165fcfb9 Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34' 2025-08-22 18:16:13 +08:00
mzl92 68d42584bd Merge branch 'develop' into feature/mzl_dev 2025-08-22 16:41:18 +08:00
mzl92 8b91924d1a 调整消息推送 2025-08-22 16:27:50 +08:00
mzl92 c1de258ce2 增加后台消息通知管理 2025-08-21 15:47:05 +08:00
mzl92 58dc6729d9 消息推送 2025-08-20 19:14:27 +08:00
mzl92 9f96b8d625 消息推送 2025-08-20 18:12:07 +08:00
mzl92 78e28a99dc ws新增 2025-08-20 13:46:59 +08:00
18338781771 87338f646f Merge branch 'feature/ticket0813' into develop 2025-08-18 13:58:20 +08:00
mzl@hnxinyouhe.com 311e407601 修改用户授权&调整生成文件 2025-08-14 10:55:46 +08:00
mzl@hnxinyouhe.com 5c6fed4e40 调整新增功能部分接口 2025-08-13 18:40:36 +08:00
18338781771 9ae23153f6 工单发送邮件通知 2025-08-13 17:00:16 +08:00
mzl@hnxinyouhe.com 2696f52db2 增加注册时根据公司进行自动授权&&调整资源列表返回 2025-08-13 15:18:36 +08:00
mzl92 98eda16356 Merge branch 'develop' into feature/mzl_dev 2025-08-13 14:19:32 +08:00
mzl@hnxinyouhe.com 122628663c 菜单权限&工单邮件 2025-08-13 14:18:11 +08:00
mzl92 855a701675 Merge branch 'master' into develop 2025-08-12 19:45:24 +08:00
mzl92 a5976af451 ts 2025-08-12 19:44:58 +08:00
mzl92 55dea2dae2 Merge branch 'develop' into feature/mzl_dev 2025-08-12 11:23:15 +08:00
mzl92 f72a5def3e ts 2025-08-12 10:44:51 +08:00
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
mzl@hnxinyouhe.com 3537d2fc3c edit inquiry 2025-08-06 18:57:09 +08:00
mzl92 f39b0ee63f Merge branch 'feature/mzl_dev'
# Conflicts:
#	app/common/utils/email/Emails.php
2025-08-05 10:05:16 +08:00
mzl92 3177e35524 edit email config 2025-08-05 09:00:36 +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 0ad2bf162c 修改飞书消息配置 2025-07-29 15:10:44 +08:00
mzl92 1a03b07f45 修改飞书应用信息 2025-07-29 14:06:57 +08:00
mzl92 7eeb1b6e1f 修改发送消息应用 2025-07-29 12:03:16 +08:00
mzl92 d74b374198 Merge branch 'develop' 2025-07-29 09:00:04 +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