 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
|
92dc7b19a9
|
路由
|
2025-07-17 10:24:46 +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 |
|
|
18338781771
|
416050a387
|
crm
|
2025-07-17 09:36:46 +08:00 |
|
|
18338781771
|
9a13c23788
|
客户
|
2025-07-15 13:52:31 +08:00 |
|
|
mzl92
|
21df784570
|
Merge branch 'master' into develop
|
2025-07-15 10:23:40 +08:00 |
|
|
mzl92
|
7c415ba060
|
Finish Hotfix-1-test
|
2025-07-15 10:23:39 +08:00 |
|
|
mzl92
|
584dfeffc3
|
模拟修改
|
2025-07-15 10:23:05 +08:00 |
|
|
18338781771
|
d102e61ddb
|
客户
|
2025-07-15 09:39:02 +08:00 |
|
|
18338781771
|
2f945b9c9f
|
Merge branch 'feature/ticket0715' into develop
|
2025-07-15 09:13:47 +08:00 |
|
|
18338781771
|
a87ff09a35
|
工单分类优化
|
2025-07-15 09:13:25 +08:00 |
|
|
18338781771
|
23384956ba
|
Merge branch 'master' into feature/ticket
# Conflicts:
# config/whitelist.php
|
2025-07-15 09:11:14 +08:00 |
|
|
18338781771
|
8fa760a3bd
|
工单分类优化
|
2025-07-15 09:07:15 +08:00 |
|
|
mzl92
|
85861240c3
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-14 19:01:42 +08:00 |
|
|
mzl92
|
94938d0586
|
Finish mzl_dev
|
2025-07-14 19:00:56 +08:00 |
|
|
mzl92
|
b40b5a6924
|
Merge branch 'develop' into feature/mzl_dev
|
2025-07-14 19:00:46 +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
|
3e180c74ef
|
Finish mzl_dev
|
2025-07-14 18:55:11 +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
|
25e33cbbcf
|
Finish mzl_dev
|
2025-07-14 14:23:19 +08:00 |
|
|
mzl92
|
373236b92f
|
修改获取菜单的方式
|
2025-07-14 14:22:57 +08:00 |
|
 chenlan
|
0ee62d507c
|
修改获取菜单
|
2025-07-14 14:20:07 +08:00 |
|
|
mzl92
|
91041aee15
|
Merge branch 'master' into develop
# Conflicts:
# app/controller/IndexController.php
|
2025-07-14 12:01:27 +08:00 |
|
|
mzl92
|
8f8a629eaf
|
Finish Hotfix-1
|
2025-07-14 12:00:57 +08:00 |
|
|
mzl92
|
c96d2f6478
|
修正清理缓存
|
2025-07-14 12:00:36 +08:00 |
|
|
mzl92
|
72878f49ea
|
Merge commit 'acd428f57bceb73ddc770cc6b59f8be7a237af90'
|
2025-07-14 10:08:29 +08:00 |
|
|
mzl92
|
acd428f57b
|
Finish mzl_dev
|
2025-07-14 00:01:22 +08:00 |
|
|
mzl92
|
4f0393aa57
|
Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev
|
2025-07-13 23:59:55 +08:00 |
|
|
chenlan
|
585c126737
|
增加手动设置权限
|
2025-07-13 23:59:15 +08:00 |
|
|
mzl92
|
c237b018d3
|
Finish mzl_dev
|
2025-07-13 22:14:39 +08:00 |
|
|
mzl92
|
3296bf5615
|
Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev
|
2025-07-13 22:11:22 +08:00 |
|
|
mzl92
|
fc11902aff
|
修改菜单排序方式
|
2025-07-13 22:07:55 +08:00 |
|
|
18338781771
|
f8e09f8cb0
|
Merge branch 'feature/ticket' into develop
|
2025-07-11 19:11:25 +08:00 |
|
|
18338781771
|
cff295d2c8
|
1
|
2025-07-11 19:11:19 +08:00 |
|
|
18338781771
|
f5f59db5fd
|
Merge branch 'feature/ticket' into develop
|
2025-07-11 18:10:16 +08:00 |
|
|
18338781771
|
f2b0181629
|
修改工单校验
|
2025-07-11 18:09:36 +08:00 |
|
|
mzl92
|
925c5501f7
|
Merge branch 'develop'
|
2025-07-11 18:01:23 +08:00 |
|
|
mzl92
|
9bc88c91f1
|
Finish mzl_dev
|
2025-07-11 18:00:21 +08:00 |
|
|
18338781771
|
ac65d2c5b5
|
Merge branch 'develop' into feature/mzl_dev
|
2025-07-11 17:54:04 +08:00 |
|
|
18338781771
|
69d4868dbb
|
Merge branch 'feature/ticket' into develop
|
2025-07-11 17:53:52 +08:00 |
|
|
18338781771
|
a6ab359db4
|
分类修改
|
2025-07-11 17:53:45 +08:00 |
|
|
18338781771
|
1677429c12
|
Merge branch 'develop' into feature/mzl_dev
|
2025-07-11 17:51:35 +08:00 |
|
|
18338781771
|
85bc48dc36
|
Merge branch 'feature/ticket' into develop
|
2025-07-11 17:51:23 +08:00 |
|
|
18338781771
|
17612a02dd
|
分类修改
|
2025-07-11 17:49:45 +08:00 |
|
|
mzl92
|
96b6637814
|
Merge branch 'feature/mzl_dev' into develop
|
2025-07-11 17:16:45 +08:00 |
|
|
mzl92
|
80945c79c1
|
Merge branch 'develop' into feature/mzl_dev
|
2025-07-11 17:15:52 +08:00 |
|