Commit Graph

608 Commits

Author SHA1 Message Date
曹鹏飞 2010e0b5a8 Merge branch 'feature/bug-523' into develop 2025-07-25 17:21:53 +08:00
曹鹏飞 80564cfcb8 feat: bug-523 支持1GB大文件的分片断点续传 2025-07-25 17:21:06 +08:00
曹鹏飞 7dfc07fbf9 Merge branch 'feature/product' into test 2025-07-25 16:49:20 +08:00
曹鹏飞 77c58572f7 feat: bug-526 产品机型导入参数翻译逻辑调整 2025-07-25 16:42:14 +08:00
曹鹏飞 b13c88946a feat: bug-524 调整异常提示,只提示系统错误和编号,不提示具体错误描述 2025-07-25 10:06:43 +08:00
曹鹏飞 5fe030e663 Merge branch 'feature/bug-523' into develop 2025-07-24 14:17:52 +08:00
曹鹏飞 7a2b031d43 feat: bug-523 支持1GB大文件的分片断点续传 2025-07-24 14:16:46 +08:00
曹鹏飞 67fef396ff Merge branch 'feature/bug-384' into develop 2025-07-23 16:38:07 +08:00
曹鹏飞 876ba23d1d feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 16:37:54 +08:00
曹鹏飞 d8343eaf1a Merge branch 'feature/bug-384' into develop 2025-07-23 15:58:56 +08:00
曹鹏飞 4b082ce4af feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 15:58:36 +08:00
曹鹏飞 63bb718b31 feat: 上传文件最大支持1GB 2025-07-23 14:45:37 +08:00
曹鹏飞 e731095f0d feat: 上传文件最大支持1GB 2025-07-23 14:40:55 +08:00
曹鹏飞 773e744291 Merge branch 'feature/bug-384' into develop 2025-07-23 14:15:30 +08:00
曹鹏飞 d15a3b4b86 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 14:15:14 +08:00
曹鹏飞 0f86534e1b Merge branch 'feature/bug-384' into develop
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
2025-07-23 13:48:48 +08:00
曹鹏飞 5f5ae39a06 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 13:47:07 +08:00
曹鹏飞 f075968269 feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 2025-07-23 11:37:20 +08:00
曹鹏飞 8e1ab13d59 Merge branch 'feature/product' into test 2025-07-22 10:03:25 +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
曹鹏飞 5bbc03e5c9 Merge branch 'feature/product' into test 2025-07-17 12:17:15 +08:00
曹鹏飞 77a60f754b fix: 修复用户端产品类型列表里的产品主要参数排序与设置不一致的问题 2025-07-17 12:16:57 +08:00
曹鹏飞 c4b047f52e Merge branch 'feature/product' into test 2025-07-15 15:48:32 +08:00
曹鹏飞 e5bf7cdd58 Merge branch 'feature/product' into develop 2025-07-14 10:59:10 +08:00
曹鹏飞 6c972d43c6 feat: 一些优化 2025-07-14 10:58:58 +08:00
曹鹏飞 fbbf872517 Merge branch 'feature/product' into develop 2025-07-14 10:51:45 +08:00
曹鹏飞 9d2cf28253 Merge branch 'feature/bug-20250707' into feature/product 2025-07-14 10:51:19 +08:00
曹鹏飞 1b1a11f7c4 Merge branch 'feature/bug-20250707' into test 2025-07-14 10:50:51 +08:00
曹鹏飞 b6ec959050 feat: 优化错误提示 2025-07-14 10:50:40 +08:00
曹鹏飞 5cc6b215d6 Merge branch 'feature/bug-20250707' into test 2025-07-14 10:45:25 +08:00
曹鹏飞 1b3e5cf7c2 feat: 优化排序 2025-07-14 10:45:12 +08:00
曹鹏飞 1b07a13273 Merge branch 'feature/bug-20250707' into test 2025-07-14 10:39:23 +08:00
曹鹏飞 6bb2b93bc6 feat: 优化排序 2025-07-14 10:39:08 +08:00
曹鹏飞 2b8e7b97eb Merge branch 'feature/product' into test
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.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/impl/ProductModelParamsServiceImpl.java
2025-07-10 18:12:08 +08:00
曹鹏飞 fdd5589abd feat: 一些优化 2025-07-10 18:09:04 +08:00
曹鹏飞 ae8a4e2cde Merge branch 'feature/product' into develop 2025-07-10 09:47:54 +08:00
曹鹏飞 68995b9f43 feat: 类型排序增加系列批次号条件 2025-07-08 15:08:59 +08:00
曹鹏飞 28febf0e2e feat: 类型排序增加系列批次号条件 2025-07-08 15:08:45 +08:00
曹鹏飞 b47600b88b feat: 机型排序增加类型系列号条件 2025-07-08 15:01:21 +08:00
曹鹏飞 3d0545b8c5 feat: 机型排序增加类型系列号条件 2025-07-08 15:01:03 +08:00
曹鹏飞 ea8749f817 fix: 甲方提出的一些问题 2025-07-08 12:02:58 +08:00
曹鹏飞 247f3dfeef fix: 甲方提出的一些问题 2025-07-08 12:01:11 +08:00
曹鹏飞 f8e4c95077 Merge branch 'feature/bug-20250707' into develop 2025-07-08 11:16:07 +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
曹鹏飞 ef015c4336 Merge branch 'feature/bug-20250707' into develop
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelVideoItem.java
2025-07-08 09:26:32 +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