Commit Graph

63 Commits

Author SHA1 Message Date
18338781771 87338f646f Merge branch 'feature/ticket0813' into develop 2025-08-18 13:58:20 +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
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 1559dc47e7 校验 2025-08-14 17:22:03 +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 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
chenlan 962f891898 补充权限代码块儿注释说明 2025-08-14 11:06:54 +08:00
mzl@hnxinyouhe.com 311e407601 修改用户授权&调整生成文件 2025-08-14 10:55:46 +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
mzl@hnxinyouhe.com c4249dd018 修正误删代码 2025-08-13 19:37:52 +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 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 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
chenlan 15c089e0aa ts 2025-08-12 19:03:37 +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
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
mzl@hnxinyouhe.com 3537d2fc3c edit inquiry 2025-08-06 18:57:09 +08:00
mzl92 7187731dc2 ts 2025-08-05 11:33:57 +08:00
mzl92 f39b0ee63f Merge branch 'feature/mzl_dev'
# Conflicts:
#	app/common/utils/email/Emails.php
2025-08-05 10:05:16 +08:00
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 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
mzl92 e10d167aec ts 2025-07-31 10:34:15 +08:00
mzl92 3a63b714c0 修正绕过系统检查 2025-07-30 18:40:49 +08:00
mzl92 0ad2bf162c 修改飞书消息配置 2025-07-29 15:10:44 +08:00