Commit Graph

10 Commits

Author SHA1 Message Date
18338781771 4988129503 用户编辑 2025-07-18 10:04:54 +08:00
18338781771 59d81b4db4 合并 2025-07-17 10:42:43 +08:00
18338781771 fe968200ce Merge branch 'develop' into feature/crmAdmin0717
# Conflicts:
#	app/admin/controller/RoleController.php
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/logic/PermLogic.php
#	app/common/model/User.php
#	app/common/service/PermService.php
#	app/common/validate/RoleValidate.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/ticket/controller/ConversationController.php
#	app/ticket/controller/TicketController.php
#	app/ticket/logic/TicketLogic.php
#	app/ticket/service/CategorieService.php
#	app/ticket/service/TicketService.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php
2025-07-17 10:07:42 +08:00
chenlan 585c126737 增加手动设置权限 2025-07-13 23:59:15 +08:00
mzl92 fc11902aff 修改菜单排序方式 2025-07-13 22:07:55 +08:00
mzl92 92eff91747 新增权限功能 2025-07-11 14:52:16 +08:00
mzl92 43d673ad9c 新增功能 2025-07-10 14:14:08 +08:00
mzl92 396e92ac1b 新增 2025-07-09 17:58:30 +08:00
mzl92 4ddf4921b2 登录中心功能开发 2025-07-07 18:34:21 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00