Commit Graph

879 Commits

Author SHA1 Message Date
18338781771 8cf4f0c23c 1 2025-07-31 15:43:53 +08:00
mzl92 0f650f6bfc Merge branch 'master' into develop 2025-07-31 10:36:30 +08:00
mzl92 e10d167aec ts 2025-07-31 10:34:15 +08:00
18338781771 9d81c23e8a 1 2025-07-31 10:29:29 +08:00
18338781771 1c7ca2a999 初始化用户密码 2025-07-31 10:02:46 +08:00
mzl92 8f4db9ed97 Merge branch 'master' into develop
# Conflicts:
#	app/common/logic/AuthLogic.php
2025-07-30 18:41:37 +08:00
mzl92 62a63adbd3 Finish 修正飞书登录绕过系统检查 2025-07-30 18:41:14 +08:00
mzl92 3a63b714c0 修正绕过系统检查 2025-07-30 18:40:49 +08:00
mzl92 74d3e93fec Finish mzl_dev 2025-07-30 16:14:21 +08:00
mzl92 fc8cdbb89d Merge branch 'develop' into feature/mzl_dev 2025-07-30 16:14:06 +08:00
mzl92 e8af949f36 Merge branch 'develop' into feature/mzl_dev 2025-07-30 16:13:53 +08:00
mzl92 ad23809a10 1 2025-07-30 16:12:19 +08:00
18338781771 1c0039a9c5 Merge branch 'feature/crmAdmin0717' 2025-07-30 15:40:26 +08:00
18338781771 ecff4e0f60 Merge branch 'feature/crmAdmin0717' into develop 2025-07-30 15:39:56 +08:00
18338781771 a47cdaef0f 公司id 2025-07-30 15:39:41 +08:00
18338781771 dc5766d87a Merge branch 'feature/crmAdmin0717' 2025-07-30 15:16:36 +08:00
18338781771 63902d3d39 Merge branch 'feature/crmAdmin0717' into develop 2025-07-30 15:16:06 +08:00
18338781771 269bd7168e 公海区分 2025-07-30 15:15:57 +08:00
18338781771 63cc2b8a7e Merge branch 'develop'
# Conflicts:
#	app/crm/controller/CustomerController.php
#	app/crm/service/CustomerService.php
2025-07-30 11:51:16 +08:00
18338781771 0bd4a56de2 Merge branch 'feature/crmAdmin0717' into develop 2025-07-30 10:22:31 +08:00
18338781771 c8fb9f5b19 录入人 2025-07-30 10:22:25 +08:00
18338781771 67d58d6170 Merge branch 'feature/crmAdmin0717' into develop 2025-07-30 10:15:24 +08:00
18338781771 68bbdc0fba 录入人 2025-07-30 10:13:26 +08:00
mzl92 caa04809a9 Merge branch 'master' into develop
# Conflicts:
#	app/command/DomainCommand.php
#	app/common/utils/FeishuMessage.php
#	app/queue/redis/FeishuMessage.php
#	app/queue/redis/InquiryToCrm.php
2025-07-29 19:39:17 +08:00
mzl92 c641b5cb1f 修改脚本 2025-07-29 19:02:49 +08:00
mzl92 0ad2bf162c 修改飞书消息配置 2025-07-29 15:10:44 +08:00
mzl92 1a03b07f45 修改飞书应用信息 2025-07-29 14:06:57 +08:00
mzl92 a86ec2e105 Merge branch 'develop'
# Conflicts:
#	app/common/utils/FeishuMessage.php
#	app/inquiry/controller/InquiryLogController.php
#	app/queue/redis/FeishuMessage.php
2025-07-29 12:35:19 +08:00
mzl92 e191788e0a 移除商机等级转换 2025-07-29 12:33:48 +08:00
mzl92 7eeb1b6e1f 修改发送消息应用 2025-07-29 12:03:16 +08:00
18338781771 69e79c0e74 工单状态 2025-07-29 11:51:00 +08:00
mzl92 21b2851037 Merge branch 'develop'
# Conflicts:
#	app/common/logic/PermLogic.php
2025-07-29 11:13:54 +08:00
mzl92 78cfb92a9e 增加公共菜单处理 2025-07-29 11:12:47 +08:00
mzl92 1f602a690b Merge branch 'develop'
# Conflicts:
#	app/common/controller/NotifyController.php
#	app/common/service/UserService.php
#	app/crm/service/CustomerService.php
#	config/constants/Constants.php
2025-07-29 10:24:10 +08:00
mzl92 f688fa342a 商机标识 2025-07-29 10:22:17 +08:00
mzl92 2dae0f42c4 ts 2025-07-29 10:19:15 +08:00
18338781771 638a5a07ca Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 10:13:57 +08:00
18338781771 6722f24fcf 用户信息 2025-07-29 10:13:50 +08:00
18338781771 f1fe343248 Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 10:06:14 +08:00
18338781771 00f920df18 头像 2025-07-29 10:06:06 +08:00
18338781771 d8d359f03d Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 09:32:35 +08:00
18338781771 01163a4c8d 商机修改 2025-07-29 09:32:23 +08:00
mzl92 d74b374198 Merge branch 'develop' 2025-07-29 09:00:04 +08:00
mzl92 39bd343893 调整询单列表 2025-07-29 08:58:51 +08:00
mzl92 17c34e0985 处理富文本图片显示处理富文本图片显示 2025-07-28 19:51:04 +08:00
mzl92 ad21c932ca 脚本处理 2025-07-28 19:44:57 +08:00
mzl92 816ed1a297 脚本处理 2025-07-28 19:36:21 +08:00
mzl92 6eb6cd61be 增加忽略上传文件 2025-07-28 18:51:24 +08:00
mzl92 22bee76835 询单url调整 2025-07-28 18:49:33 +08:00
mzl92 1a54a55653 飞书增加获取企业邮箱 2025-07-28 14:03:15 +08:00