Commit Graph

1046 Commits

Author SHA1 Message Date
mzl92 abd6d5516e 新增公共数据接口i 2025-07-11 17:15:10 +08:00
mzl92 3ef2957db3 Merge remote-tracking branch 'origin/develop' into develop 2025-07-11 15:22:18 +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 1a2cb17785 Merge branch 'develop' into feature/mzl_dev
# 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:17:29 +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 91f26b740e Merge branch 'develop' into feature/mzl_dev
# 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:07:31 +08:00
mzl92 fef9422da0 调整菜单方法 2025-07-11 15:00:21 +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 d60fc49022 Merge branch 'feature/mzl_dev' into feature/ticket 2025-07-10 14:29:56 +08:00
18338781771 a45d586f07 crm 2025-07-10 14:27:56 +08:00
mzl92 3a72f8ec0a Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/common/controller/AuthController.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	config/middleware.php
#	config/route.php
2025-07-10 14:17:50 +08:00
mzl92 43d673ad9c 新增功能 2025-07-10 14:14:08 +08:00
18338781771 9f077f7572 Merge branch 'feature/mzl_dev' into feature/crmAdmin
# Conflicts:
#	app/functions.php
#	config/constants/Constants.php
#	config/middleware.php
2025-07-10 11:14:30 +08:00
18338781771 c325794bc1 获取userid 2025-07-10 10:08:30 +08:00
18338781771 030f8fd56e Merge branch 'feature/mzl_dev' into feature/ticket 2025-07-10 09:40:15 +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 f6323f2513 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/functions.php
#	config/middleware.php
2025-07-09 19:10:31 +08:00
mzl92 37a844c01d 合并devlop 2025-07-09 19:09:16 +08:00
mzl92 396e92ac1b 新增 2025-07-09 17:58:30 +08:00
18338781771 f19efd85b0 1 2025-07-09 15:10:14 +08:00
18338781771 42eb3cc254 Merge branch 'develop' into feature/crmAdmin 2025-07-09 09:36:11 +08:00
mzl92 4ddf4921b2 登录中心功能开发 2025-07-07 18:34:21 +08:00
18338781771 03a6d65b00 表前缀 2025-07-07 15:27:48 +08:00
18338781771 bb1f105021 状态修改校验(不能倒退状态) 2025-07-04 16:10:16 +08:00
18338781771 92fd6d4d9f 工单列表分类名称 2025-07-04 15:42:03 +08:00
18338781771 6fa4b8ddfd 状态调整 2025-07-04 15:27:09 +08:00
18338781771 510fec0533 1 2025-07-04 15:06:41 +08:00
18338781771 388747634a 工单列表 2025-07-04 15:04:29 +08:00
18338781771 b70fc6c4f8 1 2025-07-04 14:44:46 +08:00
18338781771 1b73974d46 1 2025-07-04 14:38:00 +08:00
18338781771 345e2391b1 附件oss 2025-07-04 14:21:21 +08:00
18338781771 3be2ae983c 工单分类 2025-07-04 13:45:50 +08:00
18338781771 2be25889ea 上传图片 2025-07-03 16:37:56 +08:00
18338781771 92abd946b0 上传图片返回结构调整 2025-07-03 16:36:00 +08:00
18338781771 b9d9095278 状态下拉 2025-07-03 15:53:34 +08:00
18338781771 6bb4e87280 上传图片 2025-07-03 15:46:08 +08:00
18338781771 fec7988a26 上传时返回原始文件名 2025-07-03 15:42:06 +08:00
18338781771 8d36ffe13b 工单沟通记录 2025-07-03 15:28:19 +08:00
18338781771 78447737ea 请求方式修改 2025-07-03 11:23:39 +08:00
18338781771 6ef4571445 1 2025-07-03 11:19:51 +08:00
18338781771 9d7957d506 跨域 2025-07-03 10:41:55 +08:00
18338781771 6f82d5ff72 工单 2025-07-02 17:12:38 +08:00
mzl92 642c25503d mzl.log 2025-07-01 21:17:54 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00