Commit Graph

1010 Commits

Author SHA1 Message Date
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
18338781771 8f7b6a1ec3 Merge branch 'feature/crmAdmin0717' into develop 2025-07-28 09:36:33 +08:00
18338781771 6dd22ad03c 跟进提醒推送状态标记,跟进数统计计算调整 2025-07-28 09:36:16 +08:00
mzl92 323a509136 菜单缓存区分系统 2025-07-25 18:14:39 +08:00
mzl92 cf6fc7033a 菜单绑定系统 2025-07-25 18:10:11 +08:00
18338781771 32c6e8d425 Merge branch 'feature/crmAdmin0717' into develop 2025-07-25 18:04:40 +08:00
18338781771 714f8dc41e 统计 2025-07-25 18:04:32 +08:00
18338781771 c519c665bc Merge branch 'feature/crmAdmin0717' into develop 2025-07-25 17:58:49 +08:00
18338781771 e5f02d1441 统计输出 2025-07-25 17:58:42 +08:00
18338781771 509480eab5 Merge branch 'feature/crmAdmin0717' into develop 2025-07-25 17:22:32 +08:00
18338781771 0e8eab7dfb 客户列表过滤 2025-07-25 17:22:22 +08:00
18338781771 c4ed4787c6 Merge branch 'feature/crmAdmin0717' into develop 2025-07-25 17:00:15 +08:00
18338781771 60bf257cf7 脱敏 2025-07-25 17:00:03 +08:00
18338781771 e8bbc2c565 Merge branch 'feature/crmAdmin0717' into develop 2025-07-25 16:15:28 +08:00
18338781771 2141d22dda 跟进筛选 2025-07-25 16:14:09 +08:00
mzl92 04f118bcde 获取飞书应用信息增加系统id&&调整菜单显示控制 2025-07-25 16:10:59 +08:00
18338781771 98e3dc033c 公海信息脱敏 2025-07-25 15:19:33 +08:00
18338781771 b189b8c1af 公海客户时间戳处理 2025-07-25 14:43:11 +08:00
18338781771 a668ce38bc 公海客户 2025-07-25 14:41:26 +08:00
18338781771 d777c1924d 公海客户 2025-07-25 14:39:40 +08:00