10002617
|
8b5df2d339
|
zjr0325-新增邮件管理-优化
|
2026-03-30 13:50:54 +08:00 |
|
10002617
|
2c11886005
|
zjr0325-新增邮件管理-优化
|
2026-03-30 13:47:59 +08:00 |
|
10002617
|
caa228f081
|
zjr0325-新增邮件管理
|
2026-03-30 10:38:24 +08:00 |
曹鹏飞
|
0d44b7426e
|
Merge branch 'feature/quotation' into test
|
2026-03-27 15:01:37 +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 |
|
曹鹏飞
|
890d25711a
|
Merge branch 'feature/quotation' into test
|
2026-03-23 17:13:29 +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 |
|
曹鹏飞
|
e836c64d05
|
Merge branch 'test' of http://192.168.0.40:3000/huixin_back4/cfs into test
|
2026-03-12 16:44:16 +08:00 |
|
曹鹏飞
|
0d70e54929
|
Merge branch 'feature/quotation' into test
|
2026-03-12 16:42:41 +08:00 |
10001392
|
148ae13ee6
|
Merge remote-tracking branch 'origin/master-hlq20260311' into test
|
2026-03-12 08:57:24 +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
|
8db0d02235
|
Merge pull request '日志文件路径配置2' (#3) from master-lhj0311 into test
Reviewed-on: http://192.168.0.40:3000/huixin_back4/cfs/pulls/3
|
2026-03-11 16:23:19 +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 |
|
曹鹏飞
|
27cd13eb3b
|
Merge branch 'feature/gongfu-20260126' into prod/20260203
|
2026-02-03 12:14:37 +08:00 |
|
曹鹏飞
|
19e37daaaf
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:46:14 +08:00 |
|
曹鹏飞
|
d6a1074a79
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:46:00 +08:00 |
|
曹鹏飞
|
c52f86f85a
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:41:31 +08:00 |
|
曹鹏飞
|
634a245b3d
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:41:14 +08:00 |
|
曹鹏飞
|
3fb86a4565
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:30:09 +08:00 |
|
曹鹏飞
|
1d72e4bcc0
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:29:56 +08:00 |
|
曹鹏飞
|
b2d1065233
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:25:00 +08:00 |
|
曹鹏飞
|
6bac73d8b7
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:24:48 +08:00 |
|
曹鹏飞
|
422489018c
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-03 10:21:59 +08:00 |
|
曹鹏飞
|
5c20d07732
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:21:44 +08:00 |
|
曹鹏飞
|
2b74adc20c
|
Merge branch 'feature/bug-1286' into develop
# Conflicts:
# nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
|
2026-02-03 10:19:16 +08:00 |
|
曹鹏飞
|
604895d758
|
feat: bug-1286 设备售后公司转移
导入和导出添加对服务代理商的支持
|
2026-02-03 10:16:19 +08:00 |
|
曹鹏飞
|
57d850e17f
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-02 20:35:46 +08:00 |
|
曹鹏飞
|
3f063a29cd
|
feat(device): 修改设备服务代理商编码功能支持批量操作
- 将 ChangeServiceAgentCodeQuery 中的 deviceId 字段改为 deviceIds 列表
- 添加 List 类型和 NotEmpty 注解支持批量设备ID验证
- 更新 Controller 层逻辑以支持批量处理设备代理商编码变更
- 添加设备存在性检查避免无效操作
- 仅对代理商编码不同的设备执行更新操作
- 批量为每个符合条件的设备创建代理商变更记录
|
2026-02-02 20:30:57 +08:00 |
|
曹鹏飞
|
9dca96b3cf
|
Merge branch 'feature/bug-1286' into develop
|
2026-02-02 17:44:15 +08:00 |
|
曹鹏飞
|
8ba7ca24b1
|
feat(gongfu): 修改设备批量操作功能
- 将ChangeServiceAgentCodeQuery中的deviceId字段改为deviceIds列表
- 移除Controller中的@Valid注解并优化参数验证逻辑
- 实现设备批量修改代理商编码功能，支持多个设备同时处理
- 修复部署脚本中的文件路径处理逻辑
- 添加空值检查和业务逻辑优化
|
2026-02-02 17:43:57 +08:00 |
|
曹鹏飞
|
c0dfd52506
|
Merge branch 'feature/quotation' into develop
# Conflicts:
# nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java
|
2026-01-30 10:26:07 +08:00 |
|
曹鹏飞
|
6ff6b0c64f
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:57:15 +08:00 |
|
曹鹏飞
|
24dcb9df96
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:57:06 +08:00 |
|
曹鹏飞
|
9c5425877c
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:44:11 +08:00 |
|
曹鹏飞
|
8ba818a74a
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:41:18 +08:00 |
|
曹鹏飞
|
4d40c002fb
|
Merge branch 'feature/bug-1286' into develop
|
2026-01-29 17:01:23 +08:00 |
|
曹鹏飞
|
c1f91ad75a
|
feat: bug-1286 设备售后公司转移
|
2026-01-29 17:01:13 +08:00 |