Commit Graph

1039 Commits

Author SHA1 Message Date
mzl92 4eca8c46c5 修改生成文件 2025-07-22 11:34:47 +08:00
mzl92 a79f099897 Finish mzl_dev_xd 2025-07-22 11:01:11 +08:00
mzl92 9ea2af79cb Merge branch 'develop' into feature/mzl_dev_xd 2025-07-22 11:00:58 +08:00
mzl92 abafe841f8 调整菜单 2025-07-22 11:00:32 +08:00
mzl92 c8d34bdb90 Finish mzl_dev_xd 2025-07-22 10:59:21 +08:00
mzl92 d532b85b91 调整菜单结果结构 2025-07-22 10:58:22 +08:00
mzl92 61db3c7f06 Finish mzl_dev_xd 2025-07-22 10:48:42 +08:00
mzl92 9f4a25998a Merge branch 'develop' into feature/mzl_dev_xd 2025-07-22 10:48:34 +08:00
mzl92 5e75822e56 修改菜单结果结构 2025-07-22 10:48:09 +08:00
mzl92 5b8f64ab4c Finish mzl_dev_xd 2025-07-22 10:42:30 +08:00
mzl92 58aadbc1f5 调整菜单结果展示 2025-07-22 10:41:38 +08:00
mzl92 77a7337cf0 Finish mzl_dev_curd 2025-07-22 10:22:22 +08:00
mzl92 32d394aa3c Merge branch 'develop' into feature/mzl_dev_curd 2025-07-22 10:22:14 +08:00
mzl92 d00bac4703 修改菜单结果 2025-07-22 10:21:41 +08:00
mzl92 b8c96fed39 Finish mzl_dev_curd 2025-07-22 09:53:04 +08:00
mzl92 f9cafed07c 修改菜单获取方式 2025-07-22 09:52:06 +08:00
chenlan 701389ddd8 调整角色&系统&脚手架写法 2025-07-22 09:33:08 +08:00
mzl92 a7af3fe74e Finish mzl_dev_curd 2025-07-21 19:40:07 +08:00
chenlan 9d103a2c34 调整自动生成curd 2025-07-21 19:39:49 +08:00
mzl92 c42236da7e 自动生成curd 2025-07-21 19:11:29 +08:00
mzl92 6580e21880 Finish mzl_dev_curd 2025-07-21 16:59:59 +08:00
chenlan 7acf3fca99 增加预选参数-系统列表 2025-07-21 16:58:55 +08:00
mzl92 608a952ffc Finish mzl_dev_curd 2025-07-21 16:47:45 +08:00
chenlan be96c742ff 修改菜单url 2025-07-21 16:46:41 +08:00
mzl92 8adc9d2612 Finish mzl_dev_curd 2025-07-21 15:10:42 +08:00
mzl92 eae9b8e060 Merge branch 'develop' into feature/mzl_dev_curd 2025-07-21 15:10:31 +08:00
mzl92 149de9d6fb Merge branch 'develop' into feature/mzl_dev_curd 2025-07-21 15:10:14 +08:00
chenlan 45679bc5e4 crud调整 2025-07-21 15:09:06 +08:00
mzl92 a551507e4d Finish Hotfix-1 2025-07-21 14:50:30 +08:00
mzl92 1d33248a31 Merge branch 'master' into develop 2025-07-21 14:50:30 +08:00
mzl92 a57fb6132c 调整菜单url 2025-07-21 14:50:16 +08:00
18338781771 81a6b17f80 标签筛选客户 2025-07-21 14:29:58 +08:00
18338781771 f982dfee95 标签统计客户 2025-07-18 17:55:35 +08:00
mzl92 228408149b crud 2025-07-18 17:32:42 +08:00
18338781771 c87643c3ea 统计 2025-07-18 17:08:58 +08:00
18338781771 edb8c5e9e2 修改密码 2025-07-18 16:45:16 +08:00
18338781771 cc98a78ad6 跟进列表 2025-07-18 15:43:51 +08:00
18338781771 c09bf049fb 客户 2025-07-18 15:15:37 +08:00
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 ea5ef5e08d Finish Hotfix-1 2025-07-17 14:50:42 +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 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