Commit Graph

66 Commits

Author SHA1 Message Date
mzl92 f5e93f2400 Merge branch 'feature/mzl_dev' into develop
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:47:04 +08:00
mzl92 5dd2925687 Merge branch 'develop' into feature/mzl_dev 2025-09-08 20:02:26 +08:00
mzl92 153443d20f Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-08 20:01:31 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
18338781771 50a795afb7 Merge branch 'feature/stock_next' into develop 2025-09-08 18:03:21 +08:00
18338781771 d6d421cba2 服务器文件上传 2025-09-08 18:03:09 +08:00
mzl92 8340f678d6 Merge branch 'develop' into feature/mzl_dev 2025-09-08 11:35:45 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
mzl92 ea38afff9a 备货单完善 2025-09-04 18:22:24 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00
mzl92 249b61ddb8 备货单&审批流程 2025-09-04 10:26:28 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
mzl92 6a1ab1f5c3 增加备货单 2025-09-02 17:22:56 +08:00
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