Commit Graph

420 Commits

Author SHA1 Message Date
mzl92 9f96b8d625 消息推送 2025-08-20 18:12:07 +08:00
mzl92 78e28a99dc ws新增 2025-08-20 13:46:59 +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
18338781771 1559dc47e7 校验 2025-08-14 17:22:03 +08:00
18338781771 aa9c75853c 关键字 2025-08-14 16:05:51 +08:00
18338781771 ae189b49d9 编码 2025-08-14 15:56:10 +08:00
18338781771 4c89b3999c 生成code 2025-08-14 15:50:57 +08:00
18338781771 d90a8b05ce 组员客户数 2025-08-14 15:28:15 +08:00
18338781771 312c7706f9 客户转移 2025-08-14 14:11:08 +08:00
18338781771 2bbe7935ca 跟进 2025-08-14 14:03:38 +08:00
18338781771 0b1bcc94e9 跟进 2025-08-14 13:56:18 +08:00
mzl92 c6e223865f Finish mzl_dev 2025-08-14 11:28:35 +08:00
mzl92 482626e770 Merge branch 'develop' into feature/mzl_dev 2025-08-14 11:27:59 +08:00
18338781771 377407eb7d Merge branch 'develop' into feature/user0812 2025-08-14 11:15:42 +08:00
mzl@hnxinyouhe.com d08af0973b 调整创建资源不强制输入系统ID 2025-08-14 11:14:22 +08:00
mzl92 c5aa44c870 Finish mzl_dev 2025-08-14 11:10:31 +08:00
mzl@hnxinyouhe.com e45087ac31 Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-08-14 11:09:30 +08:00
chenlan 962f891898 补充权限代码块儿注释说明 2025-08-14 11:06:54 +08:00
mzl92 9076192560 Finish mzl_dev 2025-08-14 10:56:57 +08:00
mzl@hnxinyouhe.com 311e407601 修改用户授权&调整生成文件 2025-08-14 10:55:46 +08:00
18338781771 2233fb4d6b 后台编辑个人信息 2025-08-14 10:33:45 +08:00
18338781771 a59ed51f6f 用户信息 2025-08-14 10:15:38 +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
18338781771 d78567e780 Merge branch 'feature/user0812' into develop_bm 2025-08-14 09:41:39 +08:00
18338781771 879a9ee4aa 客户国家筛选 2025-08-14 09:41:28 +08:00
18338781771 d6bac2c8ec Merge branch 'feature/user0812' into develop_bm 2025-08-14 09:34:33 +08:00
18338781771 af4dd3ff85 上级id 2025-08-14 09:34:18 +08:00
mzl92 f8da1a1a4b Finish mzl_dev 2025-08-13 19:39:08 +08:00
mzl@hnxinyouhe.com c4249dd018 修正误删代码 2025-08-13 19:37:52 +08:00