172 Commits

Author SHA1 Message Date
mzl92 722a79b58b Merge branch 'develop' 2025-08-23 13:55:55 +08:00
chenlan 4b4169b5ee 修改gateway监听端口 2025-08-23 13:43:42 +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 5dc515f712 客户端消息通知 2025-08-21 19:26:28 +08:00
18338781771 61bf0fadf3 管理端回收站 2025-08-21 17:25:37 +08:00
mzl92 c1de258ce2 增加后台消息通知管理 2025-08-21 15:47:05 +08:00
mzl92 78e28a99dc ws新增 2025-08-20 13:46:59 +08:00
mzl92 dac360ec65 Merge branch 'develop' 2025-08-19 13:54:19 +08:00
18338781771 222d272e6a Merge branch 'develop_bm' into develop 2025-08-19 10:10:55 +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
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
18338781771 312c7706f9 客户转移 2025-08-14 14:11:08 +08:00
18338781771 2233fb4d6b 后台编辑个人信息 2025-08-14 10:33:45 +08:00
18338781771 f326665716 Merge branch 'develop' into feature/user0812
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-14 10:09:56 +08:00
mzl@hnxinyouhe.com b171577430 调整获取菜单权限接口 2025-08-13 19:16:49 +08:00
mzl@hnxinyouhe.com 5c6fed4e40 调整新增功能部分接口 2025-08-13 18:40:36 +08:00
18338781771 592e40122d Merge branch 'feature/user0812' into develop_bm 2025-08-13 10:36:45 +08:00
18338781771 c40d0bcec3 删除客户为放入公海 2025-08-13 10:36:32 +08:00
18338781771 b7b2950d39 1 2025-08-13 10:17:18 +08:00
18338781771 069dcb0576 路由合并修复 2025-08-13 10:09:49 +08:00
18338781771 106add4ecc Merge branch 'feature/user0812' into develop_bm
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-13 09:51:26 +08:00
18338781771 67861532ec 后台公海列表,详情跟进、重置密码 2025-08-13 09:16:02 +08:00
mzl92 c59758f03c 修改角色验证器 2025-08-13 08:49:09 +08:00
mzl@hnxinyouhe.com 8333517465 Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-08-12 15:27:39 +08:00
mzl@hnxinyouhe.com 360aeec0e1 新增后台 2025-08-12 15:26:17 +08:00
18338781771 9c19cca671 组员用户 2025-08-12 13:53:48 +08:00
mzl92 55dea2dae2 Merge branch 'develop' into feature/mzl_dev 2025-08-12 11:23:15 +08:00
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
18338781771 859fd1cff1 查询下属客户 2025-08-08 15:52:13 +08:00
mzl@hnxinyouhe.com 3537d2fc3c edit inquiry 2025-08-06 18:57:09 +08:00
18338781771 b0cbf36315 用户修改与详情 2025-08-06 13:52:17 +08:00
18338781771 40d3942a8c 用户列表 2025-08-05 17:19:12 +08:00
mzl92 3c62487cbe Merge branch 'master' into develop 2025-08-04 14:43:48 +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 ebfec84fc3 下载 2025-08-01 17:18:08 +08:00
18338781771 d016376687 审核 2025-08-01 14:20:12 +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
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 22bee76835 询单url调整 2025-07-28 18:49:33 +08:00
18338781771 de93d8bd9e 消息推送 2025-07-25 13:55:30 +08:00
mzl92 2b052ec2b4 飞书消息推送 2025-07-25 13:39:23 +08:00