 曹鹏飞
|
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 |
|
曹鹏飞
|
1d8f594bf4
|
Merge branch 'prod/20260407' into test
|
2026-04-11 08:53:04 +08:00 |
|
曹鹏飞
|
31ecde7cde
|
【优化】添加多语言支持
|
2026-04-11 08:52:23 +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 |
|
曹鹏飞
|
fc1de7c28f
|
Merge branch 'prod/20260407' into test
|
2026-04-09 19:18:33 +08:00 |
|
曹鹏飞
|
e35a9051d2
|
【优化】添加多语言支持
|
2026-04-09 19:17:41 +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 |
|
曹鹏飞
|
cdbae9579f
|
Merge branch 'prod/20260409' into test
|
2026-04-09 14:36:55 +08:00 |
|
曹鹏飞
|
8d4fcf5ddc
|
bug-1419 派工单修改后重新计算状态
|
2026-04-09 14:36:11 +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 |
|
曹鹏飞
|
68627c5a22
|
Merge branch 'prod/20260407' into test
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
|
2026-04-09 13:50:16 +08:00 |
|
曹鹏飞
|
75ad55a211
|
【优化】修复工单解决方案和部门未应用多语言的问题
|
2026-04-09 13:41:20 +08:00 |
|
曹鹏飞
|
3d7b8f5540
|
Merge branch 'prod/20260409' into test
|
2026-04-09 11:31:18 +08:00 |
|
曹鹏飞
|
877fb3b624
|
bug-1419 派工单修改后重新计算状态
|
2026-04-09 11:30:40 +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 |
|
曹鹏飞
|
2cf145f982
|
【优化】添加多语言支持
|
2026-04-07 10:53:39 +08:00 |
10002617
|
a7738792f3
|
zjr0325-新增邮件管理-优化
|
2026-03-31 09:11:48 +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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
5e38841aae
|
Merge branch 'feature/bug-1369' into prod/20260316
|
2026-03-16 09:21:52 +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 |
10001392
|
736978c29f
|
禅道优化
1、工服模块工单管理列表增加事故等级展示；派工管理列表中增加是否按时完成字段
2、移动破和工服管理的工单管理中，工单标题的翻译列，可否展示到工单列表上，或者增加个备注列？
3、工服管理的派工管理，增加设备编号筛选字段
4、派工中，要求增加导出功能，在有选中数据的情况下，导出所选数据列表。在未选中数据的情况下，默认导出所有派工数据
|
2026-03-12 08:57:08 +08:00 |
|
曹鹏飞
|
473c8f3240
|
Merge branch 'feature/bug-1369' into feature/quotation
|
2026-03-11 17:47:41 +08:00 |
|
曹鹏飞
|
f68b70dc3d
|
feat: bug-1369 工服模块，服务报告里上传报告，以及派工结案时上传附件报告时，限制上传文件在1G以内，并增加上传进度
|
2026-03-11 17:47:09 +08:00 |
10002327
|
66436f1f4d
|
日志文件路径配置2
|
2026-03-11 16:22:44 +08:00 |
|
曹鹏飞
|
75bdb66ab2
|
Merge branch 'prod/20260213' into develop
|
2026-02-12 21:18:06 +08:00 |
|
曹鹏飞
|
2bd98a83c1
|
fix(ticket): 移除工单处理中的自移除限制
- 注释掉管理员移除自己时的业务错误校验逻辑
- 允许管理员从工单处理人员列表中移除自己
- 保留其他工单处理功能的完整性
|
2026-02-12 21:17:23 +08:00 |
|
曹鹏飞
|
5ebcdf30e6
|
Merge branch 'prod/20260206' into develop
|
2026-02-06 16:54:18 +08:00 |
|
曹鹏飞
|
e788baf7dc
|
fix: bug-1314 从crm同步设备逻辑调整
移动破和工服的设备，从crm同步数据时，如果是更新设备，忽略crm中的代理商编号和名称信息，如果是新增，则不忽略
|
2026-02-06 16:49:45 +08:00 |
|
曹鹏飞
|
98c4d21568
|
Merge branch 'prod/20260203' into develop
|
2026-02-03 14:38:55 +08:00 |
|
曹鹏飞
|
2e056a3324
|
feat(device): 设备列表添加导出搜索结果功能
|
2026-02-03 14:38:36 +08:00 |
|
曹鹏飞
|
25b5f1b99b
|
Merge branch 'feature/bug-1286' into prod/20260203
# Conflicts:
# nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
|
2026-02-03 12:19:42 +08:00 |