Commit Graph

16 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 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 96b6637814 Merge branch 'feature/mzl_dev' into develop 2025-07-11 17:16:45 +08:00
mzl92 a6f2284f51 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php
2025-07-11 15:21:00 +08:00
mzl92 43d673ad9c 新增功能 2025-07-10 14:14:08 +08:00
mzl92 3d8d9f841a Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/functions.php
#	config/middleware.php
2025-07-09 19:11:57 +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
18338781771 2be25889ea 上传图片 2025-07-03 16:37:56 +08:00
18338781771 92abd946b0 上传图片返回结构调整 2025-07-03 16:36:00 +08:00
18338781771 fec7988a26 上传时返回原始文件名 2025-07-03 15:42:06 +08:00
18338781771 6f82d5ff72 工单 2025-07-02 17:12:38 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00