Commit Graph

420 Commits

Author SHA1 Message Date
mzl@hnxinyouhe.com d08af0973b 调整创建资源不强制输入系统ID 2025-08-14 11:14:22 +08:00
chenlan 962f891898 补充权限代码块儿注释说明 2025-08-14 11:06:54 +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
mzl@hnxinyouhe.com c4249dd018 修正误删代码 2025-08-13 19:37:52 +08:00
mzl92 595261ffe5 Merge branch 'develop' into feature/mzl_dev 2025-08-13 19:21:07 +08:00
mzl@hnxinyouhe.com b171577430 调整获取菜单权限接口 2025-08-13 19:16:49 +08:00
mzl@hnxinyouhe.com 4280ec41a9 移除打印 2025-08-13 18:42:06 +08:00
mzl@hnxinyouhe.com 5c6fed4e40 调整新增功能部分接口 2025-08-13 18:40:36 +08:00
18338781771 741629f19e Merge branch 'hotfix/customer' into develop 2025-08-13 17:44:41 +08:00
18338781771 f4a2966b1e 分配派卡离职人员客户 2025-08-13 17:44:05 +08:00
18338781771 9ae23153f6 工单发送邮件通知 2025-08-13 17:00:16 +08:00
mzl@hnxinyouhe.com 2696f52db2 增加注册时根据公司进行自动授权&&调整资源列表返回 2025-08-13 15:18:36 +08:00
mzl92 98eda16356 Merge branch 'develop' into feature/mzl_dev 2025-08-13 14:19:32 +08:00
mzl@hnxinyouhe.com 122628663c 菜单权限&工单邮件 2025-08-13 14:18:11 +08:00
18338781771 394872af91 user 2025-08-13 10:39:18 +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 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
mzl92 855a701675 Merge branch 'master' into develop 2025-08-12 19:45:24 +08:00
mzl92 a5976af451 ts 2025-08-12 19:44:58 +08:00
mzl92 4d2bd72831 Merge branch 'develop' into feature/mzl_dev 2025-08-12 19:05:07 +08:00
chenlan 15c089e0aa ts 2025-08-12 19:03:37 +08:00
18338781771 8b75755c44 Merge branch 'hotfix/crm' into develop 2025-08-12 17:27:54 +08:00
18338781771 e33935504b 导出 2025-08-12 17:27:04 +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
mzl92 f72a5def3e ts 2025-08-12 10:44:51 +08:00
mzl92 8fabead305 ts 2025-08-12 08:45:51 +08:00
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
18338781771 a1e2bbb30f Merge branch 'feature/ticket0807' into develop_bm 2025-08-11 11:58:41 +08:00
18338781771 41ef742a67 附件序列化一次 2025-08-11 11:58:27 +08:00
18338781771 330d8f58a5 Merge branch 'feature/ticket0807' into develop_bm 2025-08-11 10:58:14 +08:00
18338781771 f704f4e01a 头像与姓名 2025-08-11 10:58:03 +08:00
18338781771 27a99e8789 Merge branch 'feature/ticket0807' into develop_bm 2025-08-11 10:50:57 +08:00
18338781771 f45534da7d 工单用户名 2025-08-11 10:50:44 +08:00
18338781771 96b1ab3fac Merge branch 'feature/ticket0807' into develop_bm 2025-08-11 10:45:10 +08:00
18338781771 1829d013b5 调整返回的附件路径 2025-08-11 10:44:58 +08:00
18338781771 d8965cbbfa Merge branch 'feature/ticket0807' into develop_bm 2025-08-11 10:27:17 +08:00
18338781771 90be69716a 工单 2025-08-11 10:27:05 +08:00