Commit Graph

232 Commits

Author SHA1 Message Date
曹鹏飞 aa79284eea feat: bug-564 产品中心,管理端,产品资料管理这里,设置默认文件,设置错了,想取消取消不了 2025-09-09 16:50:49 +08:00
曹鹏飞 2a1420c2ff Merge branch 'develop' into test 2025-09-02 09:08:28 +08:00
曹鹏飞 d2c44ed0e2 Merge branch 'feature/bug-634' into test 2025-08-28 09:55:23 +08:00
曹鹏飞 f08e40d051 feat: bug-634 用户端(PC、手机)工单详情聊天发送按钮添加权限判断 2025-08-28 09:55:03 +08:00
曹鹏飞 ef0782b34a Merge branch 'feature/bug-632' into test 2025-08-27 16:50:47 +08:00
曹鹏飞 691fe40131 feat: bug-632 视频通话逻辑调整 2025-08-27 16:50:33 +08:00
曹鹏飞 ef36d7736d Merge branch 'feature/bug-596' into develop 2025-08-26 11:35:47 +08:00
曹鹏飞 fe3d0a5176 feat: bug-596 产品机型新品逻辑调整 2025-08-26 11:35:38 +08:00
曹鹏飞 c407f62199 Merge branch 'feature/bug-596' into develop 2025-08-26 10:59:39 +08:00
曹鹏飞 bb81885eca Merge branch 'feature/bug-612' into develop 2025-08-25 09:38:19 +08:00
曹鹏飞 3b80984bcc feat: bug-612 管理端APP,安卓及苹果端,待处理的界面,搜索功能不能用,输入任何关键词都搜索不了 2025-08-25 09:33:01 +08:00
曹鹏飞 04d6bae1f6 feat: bug-596 产品机型新品逻辑调整 2025-08-21 12:23:46 +08:00
曹鹏飞 32c8637573 Merge branch 'feature/bug-332' into develop 2025-08-20 17:31:22 +08:00
曹鹏飞 fa853a2eb6 feat: bug-332 荣誉发布、视频、图片、资料的发布需要可以批量发布的功能 2025-08-20 17:30:40 +08:00
曹鹏飞 3cd0b3d8b4 Merge branch 'feature/product' into test 2025-08-13 09:15:02 +08:00
曹鹏飞 fe6c3cc27a Merge branch 'feature/product' into develop 2025-08-12 17:39:31 +08:00
曹鹏飞 4a3d096ac2 feat: bug-565 产品机型详情页面,产品资料这里展示是有顺序的,需要在后台增加排序功能 2025-08-12 17:39:16 +08:00
曹鹏飞 14ba6d095e Merge branch 'feature/product' into test 2025-08-12 14:41:20 +08:00
曹鹏飞 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
曹鹏飞 29c5a1e556 feat: 优化视频通话逻辑 2025-08-08 18:29:18 +08:00
曹鹏飞 73ca81291c feat: 优化视频通话逻辑 2025-08-08 18:27:18 +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
曹鹏飞 8e1b1c2f61 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-08-07 17:02:34 +08:00
曹鹏飞 acf73b2799 feat: bug-242 用户端登录添加管理端用户登录的支持
优先查询用户端的用户,如果不是用户端的用户,则查询管理端用户
2025-08-07 16:49:51 +08:00
曹鹏飞 a81d362c96 feat: bug-528 app端添加管理功能
管理端工单详情接口返回数据添加创建人来源字段
2025-08-06 13:58:15 +08:00
曹鹏飞 5b9b277251 feat: bug-528 app端添加管理功能 2025-07-30 14:10:02 +08:00
曹鹏飞 ad50d8cc15 feat: bug-528 app端添加管理功能 2025-07-30 11:54:47 +08:00
曹鹏飞 5b74e604ab feat: bug-528 app端添加管理功能 2025-07-29 11:05:24 +08:00
曹鹏飞 b0c5e4880f Merge branch 'feature/bug-384' into test 2025-07-28 17:28:19 +08:00
曹鹏飞 b13c88946a feat: bug-524 调整异常提示,只提示系统错误和编号,不提示具体错误描述 2025-07-25 10:06:43 +08:00
曹鹏飞 2c5aa085ac fix: bug-505 管理端,部件管理里面,编辑部件时,部件描述填写完保存后,再点编辑进来这里就是空的,每次都要重新填写一遍才能 保存数据 2025-07-22 10:03:15 +08:00
曹鹏飞 77a60f754b fix: 修复用户端产品类型列表里的产品主要参数排序与设置不一致的问题 2025-07-17 12:16:57 +08:00
曹鹏飞 65d8b44269 Merge branch 'feature/bug-20250707' into feature/product 2025-07-08 09:25:54 +08:00
曹鹏飞 71d744cebb fix: 修复一些bug 2025-07-08 09:25:40 +08:00
曹鹏飞 bffd874909 Merge branch 'feature/bug-20250707' into feature/product
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelVideoItem.java
2025-07-07 12:04:43 +08:00
曹鹏飞 e576571238 fix: 修复一些bug 2025-07-07 12:03:41 +08:00
曹鹏飞 79c970e8ef feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-06-26 17:52:43 +08:00
曹鹏飞 b16f982650 feat: 产品中心 2025-06-25 13:35:02 +08:00
曹鹏飞 e90fa0738f Merge branch 'feature/product' into test
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductPartController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductSeriesController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductCaseSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelImageAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelVideoAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartInfoAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductPartSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesInfoAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductSeriesSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeInfoAddRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductTypeSearchRequest.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductCaseSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductHonorSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductHonorVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductImageVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductIntroSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductIntroVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelInfoVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductPartInfoVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductPartSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeSearchVO.java
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeVO.java
#	nflg-mobilebroken-product/pom.xml
#	nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java
#	nflg-mobilebroken-product/src/main/resources/bootstrap.properties
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCase.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductCaseInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductHonor.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductHonorInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntro.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductIntroInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModel.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFile.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelImage.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelParams.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelVideo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPartParams.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductSeries.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductSeriesInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductType.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductTypeInfo.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductCaseInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductCaseMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductHonorInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductHonorMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductIntroInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductIntroMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelFileMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelImageMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelVideoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductPartMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductSeriesMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeInfoMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductIntroService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.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/IProductModelService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductPartService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeInfoService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductIntroServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeInfoServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductCaseInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductCaseMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelImageMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelVideoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductPartInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductPartMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeInfoMapper.xml
#	nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
#	nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java
#	nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/RedisConfig.java
2025-06-25 10:05:12 +08:00
曹鹏飞 0a7d7ac9fd feat: 产品中心 2025-06-20 15:21:31 +08:00
曹鹏飞 91297cc2f1 feat: 产品中心 2025-06-19 14:52:13 +08:00
曹鹏飞 902a3937d6 feat: 产品中心 2025-06-18 17:49:20 +08:00
曹鹏飞 13df05f316 feat: 产品中心 2025-06-17 18:08:49 +08:00
曹鹏飞 4e60b1fb32 feat: 产品中心 2025-06-16 17:16:46 +08:00
曹鹏飞 3064174bbf feat: 产品中心,调整排序逻辑 2025-06-15 15:15:46 +08:00
曹鹏飞 e40199b564 feat: 产品中心 2025-06-14 16:46:41 +08:00
曹鹏飞 88cfd1df74 feat: 产品中心 2025-06-11 10:45:01 +08:00
曹鹏飞 878c73d602 feat: 产品中心 2025-06-11 09:49:17 +08:00