Commit Graph

50 Commits

Author SHA1 Message Date
mzl92 476921e6b8 备货单 2025-09-02 09:36:37 +08:00
mzl92 b3d8029e6d Merge branch 'develop_bm' into feature/mzl_dev
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-09-01 14:06:34 +08:00
mzl92 29f573a467 st 2025-09-01 14:00:44 +08:00
mzl92 847303a8fa 汽车信息基础库 2025-09-01 10:08:51 +08:00
mzl92 8b91924d1a 调整消息推送 2025-08-22 16:27:50 +08:00
mzl92 5dc515f712 客户端消息通知 2025-08-21 19:26:28 +08:00
mzl92 c1de258ce2 增加后台消息通知管理 2025-08-21 15:47:05 +08:00
mzl92 58dc6729d9 消息推送 2025-08-20 19:14:27 +08:00
mzl92 9f96b8d625 消息推送 2025-08-20 18:12:07 +08:00
mzl92 78e28a99dc ws新增 2025-08-20 13:46:59 +08:00
18338781771 1fba636779 Merge branch 'feature/user0812' into develop 2025-08-14 19:52:36 +08:00
18338781771 60843f0621 用户过滤 2025-08-14 19:52:23 +08:00
18338781771 d7d14e8d44 Merge branch 'feature/user0812' into develop 2025-08-14 19:49:29 +08:00
18338781771 5ae97c9fee 过滤 2025-08-14 19:49:20 +08:00
mzl92 b60f2238cc Merge branch 'develop' into feature/mzl_dev 2025-08-14 18:03:54 +08:00
mzl@hnxinyouhe.com 9f8d634611 增加菜单列表筛选 2025-08-14 18:03:22 +08:00
18338781771 b1b58b88bf Merge branch 'develop_bm' into develop 2025-08-14 17:48:31 +08:00
mzl@hnxinyouhe.com 25ab9cafd5 增加菜单列表筛选 2025-08-14 17:48:24 +08:00
18338781771 4c89b3999c 生成code 2025-08-14 15:50:57 +08:00
18338781771 d90a8b05ce 组员客户数 2025-08-14 15:28:15 +08:00
mzl@hnxinyouhe.com d08af0973b 调整创建资源不强制输入系统ID 2025-08-14 11:14:22 +08:00
18338781771 a59ed51f6f 用户信息 2025-08-14 10:15:38 +08:00
18338781771 f326665716 Merge branch 'develop' into feature/user0812
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-14 10:09:56 +08:00
mzl@hnxinyouhe.com b171577430 调整获取菜单权限接口 2025-08-13 19:16:49 +08:00
mzl@hnxinyouhe.com 5c6fed4e40 调整新增功能部分接口 2025-08-13 18:40:36 +08:00
mzl@hnxinyouhe.com 122628663c 菜单权限&工单邮件 2025-08-13 14:18:11 +08:00
18338781771 106add4ecc Merge branch 'feature/user0812' into develop_bm
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-13 09:51:26 +08:00
mzl@hnxinyouhe.com 360aeec0e1 新增后台 2025-08-12 15:26:17 +08:00
18338781771 9c19cca671 组员用户 2025-08-12 13:53:48 +08:00
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
18338781771 638a5a07ca Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 10:13:57 +08:00
18338781771 6722f24fcf 用户信息 2025-07-29 10:13:50 +08:00
18338781771 f1fe343248 Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 10:06:14 +08:00
18338781771 00f920df18 头像 2025-07-29 10:06:06 +08:00
18338781771 d8d359f03d Merge branch 'feature/crmAdmin0717' into develop 2025-07-29 09:32:35 +08:00
18338781771 01163a4c8d 商机修改 2025-07-29 09:32:23 +08:00
mzl92 323a509136 菜单缓存区分系统 2025-07-25 18:14:39 +08:00
mzl92 cf6fc7033a 菜单绑定系统 2025-07-25 18:10:11 +08:00
mzl92 04f118bcde 获取飞书应用信息增加系统id&&调整菜单显示控制 2025-07-25 16:10:59 +08:00
mzl92 36288fa64d 增加询单发布&分配&用户全量 2025-07-23 17:06:48 +08:00
chenlan 7acf3fca99 增加预选参数-系统列表 2025-07-21 16:58:55 +08:00
chenlan be96c742ff 修改菜单url 2025-07-21 16:46:41 +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 228408149b crud 2025-07-18 17:32: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 3d8d9f841a Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/functions.php
#	config/middleware.php
2025-07-09 19:11:57 +08:00
18338781771 6f82d5ff72 工单 2025-07-02 17:12:38 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00