Commit Graph

49 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
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
18338781771 416050a387 crm 2025-07-17 09:36:46 +08:00
18338781771 9a13c23788 客户 2025-07-15 13:52:31 +08:00
mzl92 584dfeffc3 模拟修改 2025-07-15 10:23:05 +08:00
18338781771 d102e61ddb 客户 2025-07-15 09:39:02 +08:00
18338781771 a87ff09a35 工单分类优化 2025-07-15 09:13:25 +08:00
mzl92 85861240c3 Merge branch 'develop'
# Conflicts:
#	app/common/logic/PermLogic.php
2025-07-14 19:01:42 +08:00
mzl92 bf5339724a Merge branch 'develop'
# Conflicts:
#	app/common/logic/PermLogic.php
2025-07-14 18:55:59 +08:00
mzl92 f915fd77a1 Merge commit '25e33cbbcf6d6b965148fc9da466cbfba4e9f73e' 2025-07-14 14:24:03 +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 925c5501f7 Merge branch 'develop' 2025-07-11 18:01:23 +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
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
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 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