Commit Graph

330 Commits

Author SHA1 Message Date
曹鹏飞 61999f84d6 Merge branch 'feature/product' into develop 2025-08-12 11:41:02 +08:00
曹鹏飞 adc503652d feat: bug-562 机型资料需要支持批量发布 2025-08-12 11:40:45 +08:00
曹鹏飞 45c4399369 Merge branch 'feature/bug-558' into develop 2025-08-08 16:02:47 +08:00
曹鹏飞 c83cebf5f6 feat: bug-558 登录售后服务系统PC客户端,或APP端。优先取代理商账号,以代理商账号为准。没有代理商账号,再取管理端内部账号 2025-08-08 15:57:36 +08:00
曹鹏飞 7d1d588238 Merge branch 'feature/bug-500' into develop
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
#	nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
#	nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketFavoritesService.java
2025-08-08 15:41:01 +08:00
曹鹏飞 e22e20ae10 feat: bug-500 管理端,新的职位添加进来,给新用户配置了职位和角色,没法配置其数据权限,无法看到全部工单数据 2025-08-08 15:31:42 +08:00
曹鹏飞 9ea8a7a167 Merge branch 'feature/bug-528' into develop 2025-08-07 18:46:54 +08:00
曹鹏飞 c6328d251d feat: bug-528 app端添加管理功能
调整视频通话逻辑
2025-08-07 18:46:38 +08:00
曹鹏飞 df47016907 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:47 +08:00
曹鹏飞 109b49d5ec feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:44 +08:00
曹鹏飞 c8d6870ba7 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:42 +08:00
曹鹏飞 1bae2a3dea feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:39 +08:00
曹鹏飞 8e1b1c2f61 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:34 +08:00
曹鹏飞 e65d8f9fc1 Merge branch 'feature/bug-528' into test 2025-08-07 15:17:41 +08:00
曹鹏飞 1c64a30430 feat: bug-528 app端添加管理功能
调整视频通话逻辑
2025-08-07 15:17:32 +08:00
曹鹏飞 7d417a33d5 Merge branch 'feature/bug-528' into test
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
2025-08-07 10:59:37 +08:00
曹鹏飞 e0c62ae8f2 feat: bug-528 app端添加管理功能
调整视频通话逻辑
2025-08-06 19:21:08 +08:00
曹鹏飞 26e7ea8fab Merge branch 'feature/bug-528' into develop 2025-08-06 09:56:55 +08:00
曹鹏飞 90d6a3c78f feat: bug-528 app端添加管理功能
修复管理端用户登录无法搜索到自己创建的订单的问题
2025-08-06 09:56:40 +08:00
曹鹏飞 4aacfd4d36 Merge branch 'feature/bug-528' into develop
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
2025-08-05 09:56:09 +08:00
曹鹏飞 8660fcd715 feat: bug-528 app端添加管理功能
1、根据菜单url查询菜单下的所有按钮列表
2、查询所有收藏夹信息,树形结构
2025-08-05 09:52:31 +08:00
曹鹏飞 66791df863 Merge branch 'feature/product' into develop 2025-08-04 10:09:15 +08:00
曹鹏飞 238fa02f7d fix: 修复一个错误 2025-08-04 10:09:03 +08:00
曹鹏飞 b2a18923f9 Merge branch 'feature/product' into test 2025-07-30 15:49:31 +08:00
曹鹏飞 4ad9b67df1 Merge branch 'feature/product' into develop 2025-07-30 15:49:19 +08:00
曹鹏飞 c9b6471b08 feat: 产品机型的重要参数和主要参数第二排序设置为id 2025-07-30 15:48:10 +08:00
曹鹏飞 6f3857f898 feat: bug-528 app端添加管理功能 2025-07-30 14:10:19 +08:00
曹鹏飞 5b9b277251 feat: bug-528 app端添加管理功能 2025-07-30 14:10:02 +08:00
曹鹏飞 3306afced9 feat: bug-528 app端添加管理功能 2025-07-29 11:07:28 +08:00
曹鹏飞 5b74e604ab feat: bug-528 app端添加管理功能 2025-07-29 11:05:24 +08:00
曹鹏飞 63e1581a5e feat: bug-528 app端添加管理功能 2025-07-29 10:01:47 +08:00
曹鹏飞 5df11931f1 fix: 修复客户端忘记密码激活时报错的问题 2025-07-28 21:30:30 +08:00
曹鹏飞 b0c5e4880f Merge branch 'feature/bug-384' into test 2025-07-28 17:28:19 +08:00
曹鹏飞 876ba23d1d feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 16:37:54 +08:00
曹鹏飞 4b082ce4af feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 15:58:36 +08:00
曹鹏飞 d15a3b4b86 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 14:15:14 +08:00
曹鹏飞 5f5ae39a06 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 13:47:07 +08:00
曹鹏飞 8e1ab13d59 Merge branch 'feature/product' into test 2025-07-22 10:03:25 +08:00
曹鹏飞 8189b7c027 fix: bug-503 管理端,机型管理里面,热图这里,描点选择部件,这里需要能够搜索部件描述,现在是搜索不了部件描述 2025-07-22 10:02:35 +08:00
曹鹏飞 5bbc03e5c9 Merge branch 'feature/product' into test 2025-07-17 12:17:15 +08:00
曹鹏飞 77a60f754b fix: 修复用户端产品类型列表里的产品主要参数排序与设置不一致的问题 2025-07-17 12:16:57 +08:00
曹鹏飞 9d2cf28253 Merge branch 'feature/bug-20250707' into feature/product 2025-07-14 10:51:19 +08:00
曹鹏飞 5cc6b215d6 Merge branch 'feature/bug-20250707' into test 2025-07-14 10:45:25 +08:00
曹鹏飞 1b3e5cf7c2 feat: 优化排序 2025-07-14 10:45:12 +08:00
曹鹏飞 1b07a13273 Merge branch 'feature/bug-20250707' into test 2025-07-14 10:39:23 +08:00
曹鹏飞 6bb2b93bc6 feat: 优化排序 2025-07-14 10:39:08 +08:00
曹鹏飞 2b8e7b97eb Merge branch 'feature/product' into test
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
2025-07-10 18:12:08 +08:00
曹鹏飞 fdd5589abd feat: 一些优化 2025-07-10 18:09:04 +08:00
曹鹏飞 68995b9f43 feat: 类型排序增加系列批次号条件 2025-07-08 15:08:59 +08:00
曹鹏飞 28febf0e2e feat: 类型排序增加系列批次号条件 2025-07-08 15:08:45 +08:00