Commit Graph

20 Commits

Author SHA1 Message Date
18338781771 deb6a2db97 获取用户信息 2025-07-18 14:07:04 +08:00
18338781771 4988129503 用户编辑 2025-07-18 10:04:54 +08:00
18338781771 02b752aa98 客户标签 2025-07-17 16:25:47 +08:00
18338781771 cb06f7a0e9 crm首页 2025-07-17 15:10:24 +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
chenlan 585c126737 增加手动设置权限 2025-07-13 23:59:15 +08:00
mzl92 96b6637814 Merge branch 'feature/mzl_dev' into develop 2025-07-11 17:16:45 +08:00
18338781771 3b805cda2b Merge branch 'feature/mzl_dev' into feature/ticket 2025-07-11 15:14:37 +08:00
18338781771 890ddff34b 我的工单 2025-07-11 15:13:44 +08:00
mzl92 92eff91747 新增权限功能 2025-07-11 14:52:16 +08:00
18338781771 a6912470bd Merge branch 'feature/mzl_dev' into feature/crmAdmin 2025-07-10 14:30:15 +08:00
18338781771 a45d586f07 crm 2025-07-10 14:27:56 +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