Commit Graph

649 Commits

Author SHA1 Message Date
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 be212317eb 修正邮件发送 2025-08-04 15:30:28 +08:00
mzl92 9d6364ca93 ts 2025-08-04 15:24:25 +08:00
mzl92 2f6609dab4 ts 2025-08-04 15:20:12 +08:00
mzl92 bd594cb81d ts 2025-08-04 15:17:07 +08:00
mzl92 3c62487cbe Merge branch 'master' into develop 2025-08-04 14:43:48 +08:00
mzl92 0ed499148c Finish Hotfix-1 2025-08-04 14:43:47 +08:00
mzl92 ea3914a3d6 ts 2025-08-04 14:43:22 +08:00
mzl92 b2d4119e46 Merge branch 'feature/mzl_dev' 2025-08-04 14:03:57 +08:00
18338781771 dbffede624 Merge branch 'feature/crmadmin0724' into develop 2025-08-04 11:24:48 +08:00
18338781771 bec1820299 转移客户路由 2025-08-04 11:24:40 +08:00
18338781771 22e7db1053 客户转移 2025-08-04 11:17:38 +08:00
18338781771 ebfec84fc3 下载 2025-08-01 17:18:08 +08:00
18338781771 d016376687 审核 2025-08-01 14:20:12 +08:00
18338781771 8f74999b47 Merge branch 'hotfix/password' 2025-08-01 13:54:04 +08:00
18338781771 1b8fa96243 Merge branch 'hotfix/password' into develop 2025-08-01 13:53:54 +08:00
18338781771 c8380ade82 客户创建时间脚本 2025-08-01 13:53:40 +08:00
18338781771 3ad640028a Merge branch 'hotfix/password' 2025-07-31 15:44:59 +08:00
18338781771 8b9f235ddb Merge branch 'hotfix/password' into develop 2025-07-31 15:44:41 +08:00
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