Commit Graph

420 Commits

Author SHA1 Message Date
曹鹏飞 238fa02f7d fix: 修复一个错误 2025-08-04 10:09:03 +08:00
曹鹏飞 c9b6471b08 feat: 产品机型的重要参数和主要参数第二排序设置为id 2025-07-30 15:48:10 +08:00
曹鹏飞 77c58572f7 feat: bug-526 产品机型导入参数翻译逻辑调整 2025-07-25 16:42:14 +08:00
曹鹏飞 e731095f0d feat: 上传文件最大支持1GB 2025-07-23 14:40:55 +08:00
曹鹏飞 2c5aa085ac fix: bug-505 管理端,部件管理里面,编辑部件时,部件描述填写完保存后,再点编辑进来这里就是空的,每次都要重新填写一遍才能 保存数据 2025-07-22 10:03:15 +08:00
曹鹏飞 8189b7c027 fix: bug-503 管理端,机型管理里面,热图这里,描点选择部件,这里需要能够搜索部件描述,现在是搜索不了部件描述 2025-07-22 10:02:35 +08:00
曹鹏飞 77a60f754b fix: 修复用户端产品类型列表里的产品主要参数排序与设置不一致的问题 2025-07-17 12:16:57 +08:00
曹鹏飞 6c972d43c6 feat: 一些优化 2025-07-14 10:58:58 +08:00
曹鹏飞 9d2cf28253 Merge branch 'feature/bug-20250707' into feature/product 2025-07-14 10:51:19 +08:00
曹鹏飞 b6ec959050 feat: 优化错误提示 2025-07-14 10:50:40 +08:00
曹鹏飞 1b3e5cf7c2 feat: 优化排序 2025-07-14 10:45:12 +08:00
曹鹏飞 6bb2b93bc6 feat: 优化排序 2025-07-14 10:39:08 +08:00
曹鹏飞 fdd5589abd feat: 一些优化 2025-07-10 18:09:04 +08:00
曹鹏飞 68995b9f43 feat: 类型排序增加系列批次号条件 2025-07-08 15:08:59 +08:00
曹鹏飞 b47600b88b feat: 机型排序增加类型系列号条件 2025-07-08 15:01:21 +08:00
曹鹏飞 ea8749f817 fix: 甲方提出的一些问题 2025-07-08 12:02:58 +08:00
曹鹏飞 c67829bc53 Merge branch 'feature/bug-20250707' into feature/product 2025-07-08 11:15:50 +08:00
曹鹏飞 0ae031e163 fix: 修复一些bug 2025-07-08 11:10:25 +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
曹鹏飞 c238051644 Merge branch 'feature/bug-20250707' into feature/product 2025-07-07 15:40:25 +08:00
曹鹏飞 be2afe982e fix: 修复一些bug 2025-07-07 15:39:15 +08:00
曹鹏飞 ddaa2879bc chore: auth和product打包优化 2025-07-07 13:44:47 +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
曹鹏飞 cb0aa4786a fix: 修复用户端的一个多语言问题 2025-07-04 16:26:31 +08:00
曹鹏飞 2c530f4a4e fix: 修复用户端的一个多语言问题 2025-07-04 16:25:59 +08:00
曹鹏飞 4a2cc93666 fix: 修复产品类型获取下拉的类型列表没有应用系列批次号查询的问题 2025-07-02 17:29:10 +08:00
曹鹏飞 2504fa66ed fix: 修复产品类型获取下拉的类型列表没有应用系列批次号查询的问题 2025-07-02 17:28:55 +08:00
曹鹏飞 c21a4e077c feat: 调整机型参数详情的数据显示顺序 2025-07-02 09:19:27 +08:00
曹鹏飞 60a1464c1e feat: 调整机型参数详情的数据显示顺序 2025-07-01 18:13:53 +08:00
曹鹏飞 f20f2e8442 feat: 如果要翻译的内容仅包含数字和符号,则直接返回,不翻译 2025-07-01 15:14:33 +08:00
曹鹏飞 da7ca1f4d7 feat: 如果要翻译的内容仅包含数字和符号,则直接返回,不翻译 2025-07-01 15:14:04 +08:00
曹鹏飞 615a037fd2 fix: 修复获取工单消息的未读消息导致的错误 2025-07-01 09:28:13 +08:00
曹鹏飞 6cdd877a0e fix: 修复获取工单消息的未读消息导致的错误 2025-07-01 09:27:38 +08:00
曹鹏飞 b2a844f3b9 feat: cfs打包时,第三方包放到lib文件夹中 2025-06-26 15:46:59 +08:00
曹鹏飞 36b30fd9a1 feat: cfs打包时,第三方包放到lib文件夹中 2025-06-26 15:46:38 +08:00
曹鹏飞 e205eb75a3 添加返回登录名信息 2025-06-26 15:01:44 +08:00
曹鹏飞 bf85aa0112 添加返回登录名信息 2025-06-26 15:01:17 +08:00
曹鹏飞 b16f982650 feat: 产品中心 2025-06-25 13:35:02 +08:00
曹鹏飞 5cab10402c feat: 产品中心 2025-06-25 11:29:10 +08:00
曹鹏飞 6ffc91321b feat: 产品中心 2025-06-25 11:15:34 +08:00
曹鹏飞 ee1cef95c4 合并 2025-06-25 10:18:45 +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
曹鹏飞 16d791ca2e fix: 优化显示 2025-06-24 09:48:54 +08:00
曹鹏飞 6fee6dffe8 fix: 优化redis数据存储 2025-06-23 15:44:54 +08:00
曹鹏飞 d3718dc2eb feat: 代理商子账号的菜单权限跟着主账号走,但是排除掉组织管理菜单 2025-06-23 15:03:45 +08:00
曹鹏飞 3859e9a8c9 feat: 产品中心 2025-06-23 14:36:56 +08:00
曹鹏飞 5d26533fa5 feat: bug-243 管理端权限调整,添加对客户端菜单的支持 2025-06-23 10:09:37 +08:00
曹鹏飞 8689bc6ef1 fix: 修复导入机型技术参数时,如果参数值为数字时报错的问题 2025-06-20 18:02:35 +08:00