 18338781771
|
deb6a2db97
|
获取用户信息
|
2025-07-18 14:07:04 +08:00 |
|
|
18338781771
|
4988129503
|
用户编辑
|
2025-07-18 10:04:54 +08:00 |
|
 mzl92
|
17395e6143
|
Merge branch 'master' into develop
|
2025-07-17 14:50:42 +08:00 |
|
|
mzl92
|
84cb69f9fe
|
调整菜单占位url
|
2025-07-17 14:49:55 +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 |
|
|
mzl92
|
85861240c3
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-14 19:01:42 +08:00 |
|
|
mzl92
|
7a289d0c65
|
调整菜单的排序
|
2025-07-14 19:00:19 +08:00 |
|
|
mzl92
|
bf5339724a
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-14 18:55:59 +08:00 |
|
|
mzl92
|
497e26e06f
|
调整获取菜单列表
|
2025-07-14 18:54:46 +08:00 |
|
|
mzl92
|
f915fd77a1
|
Merge commit '25e33cbbcf6d6b965148fc9da466cbfba4e9f73e'
|
2025-07-14 14:24:03 +08:00 |
|
|
mzl92
|
373236b92f
|
修改获取菜单的方式
|
2025-07-14 14:22:57 +08:00 |
|
 chenlan
|
0ee62d507c
|
修改获取菜单
|
2025-07-14 14:20:07 +08:00 |
|
|
mzl92
|
72878f49ea
|
Merge commit 'acd428f57bceb73ddc770cc6b59f8be7a237af90'
|
2025-07-14 10:08:29 +08:00 |
|
|
chenlan
|
585c126737
|
增加手动设置权限
|
2025-07-13 23:59:15 +08:00 |
|
|
mzl92
|
fc11902aff
|
修改菜单排序方式
|
2025-07-13 22:07:55 +08:00 |
|
|
mzl92
|
925c5501f7
|
Merge branch 'develop'
|
2025-07-11 18:01:23 +08:00 |
|
|
mzl92
|
96b6637814
|
Merge branch 'feature/mzl_dev' into develop
|
2025-07-11 17:16:45 +08:00 |
|
|
mzl92
|
fef9422da0
|
调整菜单方法
|
2025-07-11 15:00:21 +08:00 |
|
|
mzl92
|
92eff91747
|
新增权限功能
|
2025-07-11 14:52:16 +08:00 |
|
|
mzl92
|
43d673ad9c
|
新增功能
|
2025-07-10 14:14:08 +08:00 |
|
|
mzl92
|
37a844c01d
|
合并devlop
|
2025-07-09 19:09:16 +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 |
|