Commit Graph

649 Commits

Author SHA1 Message Date
18338781771 1152c1a7f9 审核优化 2025-08-19 14:17:34 +08:00
mzl92 dac360ec65 Merge branch 'develop' 2025-08-19 13:54:19 +08:00
mzl92 e5298aed8c Merge branch 'master' into develop 2025-08-19 13:47:49 +08:00
mzl92 b60e0da8d8 Finish Hotfix-1 2025-08-19 13:47:48 +08:00
mzl92 0df8e3d2eb 菜单列表增加系统筛选 2025-08-19 13:47:31 +08:00
18338781771 222d272e6a Merge branch 'develop_bm' into develop 2025-08-19 10:10:55 +08:00
18338781771 7a75d1a926 Merge branch 'feature/audit' into develop_bm 2025-08-18 18:06:46 +08:00
18338781771 a4fd38ac23 举报图片地址补全 2025-08-18 18:06:36 +08:00
18338781771 fe2d95d90a Merge branch 'feature/allocation' into develop_bm
# Conflicts:
#	app/crm/controller/CustomerController.php
#	app/crm/service/CustomerService.php
#	app/crmAdmin/service/CustomerService.php
2025-08-18 16:59:13 +08:00
18338781771 3ba830259a 分配离职客户 2025-08-18 16:54:24 +08:00
18338781771 95c6f97356 Merge branch 'feature/ticket0813' 2025-08-18 16:09:14 +08:00
18338781771 47359288e8 Merge branch 'feature/ticket0813' into develop 2025-08-18 16:08:59 +08:00
18338781771 66890fa893 邮件修复 2025-08-18 16:08:44 +08:00
18338781771 7aa717b93e 离职客户分配 2025-08-18 15:14:30 +08:00
18338781771 8be478bd83 Merge branch 'develop'
# Conflicts:
#	app/common/utils/scaffold/templates/workOrder.stub
2025-08-18 14:08:28 +08:00
18338781771 87338f646f Merge branch 'feature/ticket0813' into develop 2025-08-18 13:58:20 +08:00
18338781771 47a6616be6 Merge branch 'feature/ticket0813' into develop_bm 2025-08-18 13:57:58 +08:00
18338781771 d8b80aefec 工单邮件 2025-08-18 13:57:46 +08:00
18338781771 bf1dc28737 Merge branch 'feature/ticket0813' into develop_bm 2025-08-18 11:32:44 +08:00
18338781771 c32e768e41 工单回复 2025-08-18 11:32:33 +08:00
18338781771 c31676c5fc Merge branch 'feature/ticket0813' into develop_bm 2025-08-18 11:21:22 +08:00
18338781771 ad619362b6 类型 2025-08-18 11:20:35 +08:00
18338781771 4b6329f7ee Merge branch 'feature/ticket0813' into develop_bm 2025-08-18 10:39:06 +08:00
18338781771 5642089c62 发送邮件测试 2025-08-18 10:38:41 +08:00
18338781771 79cd5336c5 无效客户举报图文 2025-08-18 10:27:24 +08:00
18338781771 1fa2342007 分配离职员工客户 2025-08-16 16:12:06 +08:00
18338781771 646b39dec8 审核原因 2025-08-14 20:59:20 +08:00
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
18338781771 2e94a17d11 组员客户关键字 2025-08-14 20:02:40 +08:00
18338781771 1fba636779 Merge branch 'feature/user0812' into develop 2025-08-14 19:52:36 +08:00
18338781771 60843f0621 用户过滤 2025-08-14 19:52:23 +08:00
18338781771 d7d14e8d44 Merge branch 'feature/user0812' into develop 2025-08-14 19:49:29 +08:00
18338781771 5ae97c9fee 过滤 2025-08-14 19:49:20 +08:00
18338781771 e5fa0a18f9 Merge branch 'feature/user0812' into develop 2025-08-14 19:28:31 +08:00
18338781771 04d92124f1 1 2025-08-14 19:28:05 +08:00
18338781771 5eeec1747e Merge branch 'feature/user0812' into develop 2025-08-14 19:23:24 +08:00
18338781771 c85a170114 公海 2025-08-14 19:23:16 +08:00
18338781771 0323c2db7e Merge branch 'feature/user0812' into develop 2025-08-14 19:12:33 +08:00
18338781771 a4bc1e8e10 1 2025-08-14 19:11:00 +08:00
mzl92 12ab00cca7 Finish mzl_dev 2025-08-14 18:18:23 +08:00
mzl92 7c6b6b9527 Merge branch 'develop' into feature/mzl_dev 2025-08-14 18:18:09 +08:00
18338781771 73e57a6923 Merge branch 'feature/user0812' into develop 2025-08-14 18:07:42 +08:00
18338781771 060d464f09 用户中心 2025-08-14 18:07:34 +08:00
mzl92 b60f2238cc Merge branch 'develop' into feature/mzl_dev 2025-08-14 18:03:54 +08:00
mzl@hnxinyouhe.com 9f8d634611 增加菜单列表筛选 2025-08-14 18:03:22 +08:00
18338781771 b1b58b88bf Merge branch 'develop_bm' into develop 2025-08-14 17:48:31 +08:00
mzl@hnxinyouhe.com 25ab9cafd5 增加菜单列表筛选 2025-08-14 17:48:24 +08:00
18338781771 b6b7407c39 处理详情为null 2025-08-14 17:46:52 +08:00
18338781771 a8ec6889d0 更新用户 2025-08-14 17:43:19 +08:00
18338781771 fa7fdc3787 更新用户 2025-08-14 17:39:34 +08:00