 曹鹏飞
|
e31e8f9790
|
Merge branch 'prod/20260407' into test
|
2026-04-13 11:28:27 +08:00 |
|
曹鹏飞
|
5a1e9a1dda
|
【优化】添加多语言支持
|
2026-04-13 11:27:32 +08:00 |
|
曹鹏飞
|
d39d05be51
|
Merge branch 'prod/20260407' into test
|
2026-04-13 11:02:58 +08:00 |
|
曹鹏飞
|
08b0eb40e5
|
【优化】添加多语言支持
|
2026-04-13 11:01:54 +08:00 |
|
曹鹏飞
|
b7e9df3c12
|
【优化】添加多语言支持
|
2026-04-13 09:39:28 +08:00 |
|
曹鹏飞
|
bb48c81146
|
Merge branch 'prod/20260407' into test
|
2026-04-13 08:41:44 +08:00 |
|
曹鹏飞
|
23e1f093c8
|
【优化】添加多语言支持
|
2026-04-13 08:41:01 +08:00 |
|
曹鹏飞
|
e54fab1f81
|
Merge branch 'prod/20260407' into test
|
2026-04-11 10:11:59 +08:00 |
|
曹鹏飞
|
7e653786f8
|
【优化】添加多语言支持
|
2026-04-11 10:11:04 +08:00 |
|
曹鹏飞
|
0925588ad6
|
Merge branch 'prod/20260407' into test
|
2026-04-11 09:42:28 +08:00 |
|
曹鹏飞
|
358bd93a6a
|
【优化】添加多语言支持
|
2026-04-11 09:41:12 +08:00 |
|
曹鹏飞
|
f288e69162
|
Merge branch 'prod/20260407' into test
|
2026-04-11 09:12:11 +08:00 |
|
曹鹏飞
|
7b0aa46e25
|
【优化】添加多语言支持
|
2026-04-11 09:11:20 +08:00 |
|
曹鹏飞
|
d05aa4a91c
|
Merge branch 'prod/20260407' into test
|
2026-04-11 08:48:17 +08:00 |
|
曹鹏飞
|
4abd7f41bb
|
【优化】添加多语言支持
|
2026-04-11 08:46:48 +08:00 |
|
曹鹏飞
|
d5c2c18af7
|
Merge branch 'prod/20260407' into test
|
2026-04-09 19:00:55 +08:00 |
|
曹鹏飞
|
32f37cd08e
|
【优化】添加多语言支持
|
2026-04-09 18:59:57 +08:00 |
|
曹鹏飞
|
846efe55bc
|
Merge branch 'prod/20260407' into test
|
2026-04-09 17:30:32 +08:00 |
|
曹鹏飞
|
47cbfcb1f5
|
【优化】添加多语言支持
|
2026-04-09 17:27:27 +08:00 |
|
曹鹏飞
|
faee173200
|
Merge branch 'prod/20260407' into test
|
2026-04-09 14:17:26 +08:00 |
|
曹鹏飞
|
04a91a1a01
|
【优化】修复收藏夹根节点名称未应用多语言的问题
|
2026-04-09 14:10:01 +08:00 |
|
曹鹏飞
|
66a10dabde
|
Merge branch 'prod/20260407' into feature/quotation
# Conflicts:
# nflg-mobilebroken-admin/src/test/java/TTest.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
|
2026-04-08 09:22:55 +08:00 |
|
曹鹏飞
|
0fe7284ae8
|
feat(interceptor): 添加多语言拦截器实现
- 创建 LanguageInterceptor 类处理请求头中的 language 参数
- 实现 preHandle 方法从请求头获取语言设置并存储到 MultilingualUtil
- 实现 afterCompletion 方法清理 ThreadLocal 防止内存泄漏
- 在 WebConfig 中注册拦截器到 /** 路径
- 统一多个模块的 WebConfig 配置引用统一的拦截器实现
|
2026-04-08 09:21:26 +08:00 |
|
曹鹏飞
|
723828e69f
|
feat(shengwang): 添加声网配置管理功能
- 新增 ShengWangConfigVO 数据传输对象
- 在 ShengWangController 中注入 appId 和 certificate 配置
- 添加 /getConfig 接口用于获取声网配置信息
- 使用 @RefreshScope 注解支持配置热更新
- 集成 Spring Cloud 配置中心注解支持
|
2026-04-07 14:30:05 +08:00 |
|
曹鹏飞
|
2cf145f982
|
【优化】添加多语言支持
|
2026-04-07 10:53:39 +08:00 |
|
曹鹏飞
|
464ea4dd04
|
feat(dictionary): 新增字典管理功能并优化数据处理
- 新增 DictionaryController 提供完整的字典管理接口
- 实现字典搜索、保存、删除等基础操作功能
- 添加字典值翻译列表的导出导入功能
- 优化 Jackson 配置增加 BigDecimal 和字符串处理模块
- 修复 ModelConfigController 中的数据同步逻辑问题
- 添加购物车部件分组排序和价格计算优化
- 优化订单编号生成逻辑确保连续性
|
2026-04-03 17:32:36 +08:00 |
|
曹鹏飞
|
b3c625ce72
|
feat(repository): 完善删除功能
|
2026-04-01 17:09:26 +08:00 |
10002617
|
5e09b83df0
|
zjr0325-新增邮件管理-优化
|
2026-03-31 09:11:45 +08:00 |
|
10002617
|
135b92ca75
|
zjr0325-新增邮件管理
|
2026-03-31 09:11:40 +08:00 |
|
曹鹏飞
|
541735be36
|
Merge remote-tracking branch 'origin/feature/bug-1372' into prod/20260330
|
2026-03-30 17:28:54 +08:00 |
10002327
|
25e15d7639
|
Merge pull request 'master-lhj0311' (#5) from master-lhj0311 into master
Reviewed-on: http://192.168.0.40:3000/huixin_back4/cfs/pulls/5
|
2026-03-30 11:30:33 +08:00 |
曹鹏飞
|
995dbf3369
|
Merge branch 'feature/bug-1372' into feature/quotation
# Conflicts:
# nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java
|
2026-03-27 14:54:07 +08:00 |
|
曹鹏飞
|
f715b9c1a1
|
feat: bug-1372 工单问题类型从字典获取
|
2026-03-27 14:52:59 +08:00 |
10001195
|
6ef4a5094b
|
大屏看板二级界面初始化数据
|
2026-03-26 17:36:33 +08:00 |
|
10001195
|
8da43e8e4c
|
大屏看板初始化数据数据返回
|
2026-03-26 17:36:32 +08:00 |
|
10001195
|
e8da7060c9
|
大屏看板控制类增加接口
|
2026-03-26 17:36:30 +08:00 |
|
10001195
|
83149a73e7
|
大屏看板控制类
|
2026-03-26 17:36:28 +08:00 |
|
10001195
|
c5c5e38ebf
|
大屏看板控制类
|
2026-03-26 17:36:26 +08:00 |
|
曹鹏飞
|
62101a7e91
|
Merge branch 'feature/bug-1334'
|
2026-03-23 11:47:02 +08:00 |
|
曹鹏飞
|
b44d6b6d94
|
Merge branch 'feature/bug-1334' into feature/quotation
|
2026-03-23 10:33:58 +08:00 |
|
曹鹏飞
|
40006323f1
|
fix(product): 修复产品模型多语言处理逻辑
- 注释掉默认语言代码的移除操作
- 保持所有语言选项完整传递给后续处理流程
- 确保中文语言项能够正确参与语言过滤逻辑
|
2026-03-23 10:33:26 +08:00 |
|
曹鹏飞
|
960f0f79cb
|
Merge branch 'feature/bug-1334' into prod/20260317
|
2026-03-17 18:17:17 +08:00 |
|
曹鹏飞
|
26084b1e1b
|
Merge remote-tracking branch '南方路机/master' into prod/20260317
# Conflicts:
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
|
2026-03-17 18:15:42 +08:00 |
|
曹鹏飞
|
a324ff6f23
|
Merge branch 'prod/20260313' into feature/quotation
|
2026-03-13 16:07:24 +08:00 |
|
曹鹏飞
|
94baf89b03
|
调整问题类型列表
|
2026-03-13 16:06:52 +08:00 |
|
曹鹏飞
|
cb920721ef
|
feat(quotation): 实现机型折扣配置功能
- 新增折扣申请对象 VO 类用于存储折扣应用信息
- 在折扣配置控制器中添加获取机型价格接口和导出导入功能
- 更新动态表头显示折扣价标签为具体区域名称
- 重构保存方法使用 JsonNode 处理折扣数据并支持批量操作
- 添加对折扣对象数组的验证和处理逻辑
- 集成客户信息到折扣配置列表显示申请对象详情
- 实现 Excel 导入导出功能支持折扣数据批量处理
- 优化区域管理中的分类更新逻辑并添加事务支持
- 客户管理中增强区域类别一致性校验机制
|
2026-03-13 15:59:11 +08:00 |
10001392
|
8302a7e8cf
|
禅道优化
1、移动破和工服管理的工单管理中，工单标题的翻译列，可否展示到工单列表上，或者增加个备注列？
|
2026-03-13 13:50:55 +08:00 |
|
曹鹏飞
|
f36520de03
|
Merge branch 'feature/quotation-zhangke' into feature/quotation
# Conflicts:
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
# nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
# nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java
# nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/ControllerBase.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelDiscount.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelForbid.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelDiscountMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelForbidMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelDiscountService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelForbidService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelDiscountServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelForbidServiceImpl.java
# nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelDiscountMapper.xml
# nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelForbidMapper.xml
# nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java
|
2026-03-12 16:27:28 +08:00 |
10002327
|
ad78c5c3b1
|
日志文件路径配置
|
2026-03-11 15:52:16 +08:00 |
|
曹鹏飞
|
49dcfe3a15
|
Merge branch 'prod/20260310' into feature/quotation
|
2026-03-10 16:33:07 +08:00 |