曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
d3718dc2eb
|
feat: 代理商子账号的菜单权限跟着主账号走，但是排除掉组织管理菜单
|
2025-06-23 15:03:45 +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 |
|
曹鹏飞
|
9ef1194fdf
|
feat: 产品中心
|
2025-06-16 09:19:57 +08:00 |
|
曹鹏飞
|
3064174bbf
|
feat: 产品中心，调整排序逻辑
|
2025-06-15 15:15:46 +08:00 |
|
曹鹏飞
|
1746615933
|
feat: 产品中心
|
2025-06-15 11:21:17 +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 |
|
曹鹏飞
|
b69cbdca80
|
feat: 产品中心
|
2025-06-10 18:04:09 +08:00 |
|
曹鹏飞
|
143484583b
|
feat: 调整字典项显示顺序
|
2025-06-10 16:51:09 +08:00 |
|
曹鹏飞
|
e62cabc223
|
feat: 调整字典项显示顺序
|
2025-06-10 16:50:24 +08:00 |
|
曹鹏飞
|
5a82097a6d
|
feat: 产品中心
|
2025-06-10 16:44:14 +08:00 |
|
曹鹏飞
|
73d46a1eac
|
feat: 产品中心
|
2025-06-09 16:01:13 +08:00 |
|
曹鹏飞
|
55e63b36e6
|
feat: 产品中心
|
2025-06-06 17:17:52 +08:00 |
|
曹鹏飞
|
f839f2a450
|
feat: 产品中心
|
2025-06-06 15:12:05 +08:00 |
|
曹鹏飞
|
cd54719de2
|
Merge branch 'develop' into feature/product
# Conflicts:
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java
|
2025-06-05 10:24:38 +08:00 |
|
曹鹏飞
|
89379b1683
|
feat: 产品中心
|
2025-06-05 10:23:34 +08:00 |
|
曹鹏飞
|
c99ca55169
|
feat: 产品中心
|
2025-06-04 17:59:34 +08:00 |
|
曹鹏飞
|
55a950fc36
|
feat: 产品中心
|
2025-06-04 14:17:09 +08:00 |
|
曹鹏飞
|
0596db6631
|
feat: 产品中心
|
2025-06-04 14:09:36 +08:00 |
|
曹鹏飞
|
a01c75f9a5
|
feat: 产品中心
|
2025-06-03 10:50:23 +08:00 |
|
曹鹏飞
|
64079598ef
|
feat: 产品中心
|
2025-05-30 11:11:52 +08:00 |
|
曹鹏飞
|
8bf86612ae
|
feat: 产品中心
|
2025-05-29 10:10:11 +08:00 |
|
曹鹏飞
|
505a30c4d7
|
feat: 产品中心
|
2025-05-28 17:24:44 +08:00 |
|
曹鹏飞
|
233c8ae24b
|
feat: 产品中心
|
2025-05-28 16:31:54 +08:00 |
|
曹鹏飞
|
7c88be8653
|
feat: 产品中心
|
2025-05-27 17:40:36 +08:00 |
|
曹鹏飞
|
c538581345
|
feat: bug-246 添加翻译接口
使用阿里云的机器翻译接口
|
2025-05-27 09:40:27 +08:00 |
|
曹鹏飞
|
1d493b3b2f
|
feat: 产品中心
|
2025-05-27 09:27:21 +08:00 |
|
曹鹏飞
|
485ed4d8b1
|
feat: 产品中心
|
2025-05-27 09:27:08 +08:00 |