Commit Graph

  • 98c4d21568 Merge branch 'prod/20260203' into develop 曹鹏飞 2026-02-03 14:38:55 +0800
  • 2e056a3324 feat(device): 设备列表添加导出搜索结果功能 曹鹏飞 2026-02-03 14:38:36 +0800
  • 25b5f1b99b Merge branch 'feature/bug-1286' into prod/20260203 曹鹏飞 2026-02-03 12:19:42 +0800
  • 27cd13eb3b Merge branch 'feature/gongfu-20260126' into prod/20260203 曹鹏飞 2026-02-03 12:14:37 +0800
  • 19e37daaaf Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:46:14 +0800
  • d6a1074a79 feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:46:00 +0800
  • c52f86f85a Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:41:31 +0800
  • 634a245b3d feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:41:14 +0800
  • 3fb86a4565 Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:30:09 +0800
  • 1d72e4bcc0 feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:29:56 +0800
  • b2d1065233 Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:25:00 +0800
  • 6bac73d8b7 feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:24:48 +0800
  • 422489018c Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:21:59 +0800
  • 5c20d07732 feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:21:44 +0800
  • 2b74adc20c Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-03 10:19:16 +0800
  • 604895d758 feat: bug-1286 设备售后公司转移 导入和导出添加对服务代理商的支持 曹鹏飞 2026-02-03 10:16:19 +0800
  • 57d850e17f Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-02 20:35:46 +0800
  • 3f063a29cd feat(device): 修改设备服务代理商编码功能支持批量操作 曹鹏飞 2026-02-02 20:30:57 +0800
  • 9dca96b3cf Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-02-02 17:44:15 +0800
  • 8ba7ca24b1 feat(gongfu): 修改设备批量操作功能 曹鹏飞 2026-02-02 17:43:57 +0800
  • c0dfd52506 Merge branch 'feature/quotation' into develop 曹鹏飞 2026-01-30 10:26:07 +0800
  • 835c469231 fix(translate): 修复翻译接口的语言验证和文本清理逻辑 曹鹏飞 2026-01-30 10:25:06 +0800
  • 6ff6b0c64f Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-01-29 17:57:15 +0800
  • 24dcb9df96 feat: bug-1286 设备售后公司转移 曹鹏飞 2026-01-29 17:57:06 +0800
  • 9c5425877c Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-01-29 17:44:11 +0800
  • 8ba818a74a feat: bug-1286 设备售后公司转移 曹鹏飞 2026-01-29 17:41:18 +0800
  • 4d40c002fb Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-01-29 17:01:23 +0800
  • c1f91ad75a feat: bug-1286 设备售后公司转移 曹鹏飞 2026-01-29 17:01:13 +0800
  • 44ca42144c Merge branch 'prod/20260130' into develop 曹鹏飞 2026-01-29 16:57:28 +0800
  • d58eaae0d1 如果同步过来,这条ID的设备编号被删掉了(就是由非空变为空),需要把CFS里这条设备信息删掉 曹鹏飞 2026-01-29 16:52:54 +0800
  • 1a59b8ef62 Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-01-29 16:16:46 +0800
  • 4f204375af feat: bug-1286 设备售后公司转移 曹鹏飞 2026-01-29 16:16:11 +0800
  • 2c678c27cb feat(gongfu): 添加测试控制器并完善设备组件功能 曹鹏飞 2026-01-29 16:09:01 +0800
  • d8c99e3cf9 Merge branch 'feature/bug-1286' into develop 曹鹏飞 2026-01-29 11:26:09 +0800
  • 34db62ba2f feat: bug-1286 设备售后公司转移 曹鹏飞 2026-01-29 11:25:55 +0800
  • 254c0d6568 feat(product): 添加批次号功能并初始化现有数据 曹鹏飞 2026-01-28 17:53:08 +0800
  • 64f7d7cf74 设备的发货日期和开始质保日期类型由LocalDate改为String 曹鹏飞 2026-01-28 17:12:14 +0800
  • dcb02879c1 设备的发货日期和开始质保日期类型由LocalDate改为String 曹鹏飞 2026-01-26 10:44:20 +0800
  • f02e04016d 设备的发货日期和开始质保日期类型由LocalDate改为String feature/gongfu 曹鹏飞 2026-01-28 17:12:14 +0800
  • b9830ab001 Merge branch 'develop' into feature/quotation 曹鹏飞 2026-01-28 17:14:46 +0800
  • ef3357f150 设备的发货日期和开始质保日期类型由LocalDate改为String 曹鹏飞 2026-01-28 17:12:14 +0800
  • 8f9fcc2dda Merge branch 'feature/gongfu' into develop 曹鹏飞 2026-01-28 14:40:10 +0800
  • 1edb6ce1c5 Revert "设备的发货日期和开始质保日期类型由LocalDate改为String" 曹鹏飞 2026-01-28 14:38:10 +0800
  • b3e65348ff Merge branch 'develop' into feature/quotation 曹鹏飞 2026-01-28 13:52:01 +0800
  • 7e9dfb607a Merge branch 'prod/20260128' into develop 曹鹏飞 2026-01-28 11:11:19 +0800
  • e6be9a5b48 修复审核子账号后未设置isPrimary字段的问题 曹鹏飞 2026-01-28 11:11:05 +0800
  • 34df03ebd9 Merge branch 'feature/gongfu-20260126' into develop 曹鹏飞 2026-01-27 17:46:20 +0800
  • 381b9ec5f8 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-27 17:46:03 +0800
  • 0642a7f1cf Merge branch 'feature/gongfu-20260126' into develop 曹鹏飞 2026-01-27 17:17:14 +0800
  • 04d2482850 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-27 17:17:03 +0800
  • fb5a57d9fc Merge branch 'feature/gongfu-20260126' into develop 曹鹏飞 2026-01-27 16:40:55 +0800
  • 40993513dd 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-27 16:40:34 +0800
  • e9b3a581ab Merge branch 'feature/gongfu-20260126' into develop 曹鹏飞 2026-01-27 16:34:57 +0800
  • e0571e24b3 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-27 16:28:16 +0800
  • 32ee948087 Merge branch 'feature/gongfu-20260126' into develop 曹鹏飞 2026-01-27 16:06:22 +0800
  • 8d215772fe 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-27 16:06:03 +0800
  • b48c639f27 Merge branch 'bug/1278' into develop 曹鹏飞 2026-01-27 11:33:21 +0800
  • 61a0bd4a7d Merge branch 'feature/gongfu' into develop 曹鹏飞 2026-01-27 11:32:57 +0800
  • 3c148bca39 feat: bug-1278 机型参数名称在同一个父级下不允许重复 曹鹏飞 2026-01-27 11:31:11 +0800
  • 3a27008798 大屏看板初始化数据数据返回 10001195 2026-01-27 10:27:53 +0800
  • ea2073f5b3 大屏看板控制类增加接口 10001195 2026-01-27 10:22:18 +0800
  • 6982e6f538 Merge branch 'feature/gongfu-20260126' into feature/gongfu 曹鹏飞 2026-01-26 15:44:53 +0800
  • a27906a75f 工服调整20260126 1、创建订单时的区域的先隐藏,先默认为空; 2、所有的类别属性移除; 3、设备配置调整,部件不再绑定机型,改为绑定产品线; 4、修改解决方案添加组件字段 曹鹏飞 2026-01-26 15:44:37 +0800
  • 7be8384fbc 设备的发货日期和开始质保日期类型由LocalDate改为String 曹鹏飞 2026-01-26 10:47:10 +0800
  • fc78c4b352 设备的发货日期和开始质保日期类型由LocalDate改为String 曹鹏飞 2026-01-26 10:44:20 +0800
  • 0f2342cdcf 一些优化 曹鹏飞 2026-01-22 14:39:36 +0800
  • 9ea1e02e60 hotfix 添加搜索条件 曹鹏飞 2026-01-21 16:56:16 +0800
  • 47096ac6de 一些优化 曹鹏飞 2026-01-21 17:45:30 +0800
  • 63fb47a708 Merge branch 'feature/gongfu' into feature/quotation 曹鹏飞 2026-01-21 16:59:31 +0800
  • 7665a350b6 hotfix 添加搜索条件 曹鹏飞 2026-01-21 16:56:16 +0800
  • 34c1ffb170 内部账号添加直销类别字段 曹鹏飞 2026-01-21 14:01:10 +0800
  • 10e2351a24 Merge branch 'feature/data-permission' into feature/quotation 曹鹏飞 2026-01-21 09:23:33 +0800
  • 0a23640a0f 调整组织结构展示 曹鹏飞 2026-01-21 09:23:18 +0800
  • ae33e6fb90 Merge branch 'feature/data-permission' into feature/quotation 曹鹏飞 2026-01-20 16:40:51 +0800
  • 869914819c 移除代理商中的地域类型,因为地域类型需要放到代理商公司中 曹鹏飞 2026-01-20 16:40:32 +0800
  • 82aa17f77a 区域添加字段:类别(国内、国外),字典id 曹鹏飞 2026-01-20 16:00:47 +0800
  • b33d1c393d Merge branch 'feature/data-permission' into feature/quotation 曹鹏飞 2026-01-20 15:28:41 +0800
  • 3ef8d33592 将基础信息表(字典、菜单、角色等)的id字段类型改为Long,便于上生产环境时迁移数据 feature/data-permission 曹鹏飞 2026-01-20 15:23:46 +0800
  • a85a236994 Merge branch 'feature/data-permission' into feature/quotation 曹鹏飞 2026-01-20 09:24:55 +0800
  • e0579c4c5c Merge branch 'feature/gongfu' into feature/data-permission 曹鹏飞 2026-01-20 09:24:20 +0800
  • c073ce668c 服务报告添加对服务月报的上传支持 曹鹏飞 2026-01-19 10:46:21 +0800
  • 3c77153dfc Merge branch 'prod/20260119' into feature/gongfu 曹鹏飞 2026-01-19 15:30:18 +0800
  • 1d0e85f6f0 移除代理商过期处理定时任务 曹鹏飞 2026-01-19 15:29:55 +0800
  • 8a6bbcc7a1 Merge branch 'feature/gongfu' into feature/data-permission 曹鹏飞 2026-01-19 10:46:54 +0800
  • 2c9047d1a5 服务报告添加对服务月报的上传支持 曹鹏飞 2026-01-19 10:46:21 +0800
  • 2823430d31 feat(department): 完善部门管理功能并优化用户关联逻辑 曹鹏飞 2026-01-19 09:50:09 +0800
  • 6f845e50ae Merge branch 'feature/gongfu' into feature/data-permission 曹鹏飞 2026-01-16 16:23:28 +0800
  • 392956408e feat(ticket): 添加主要负责人字段到工单PDF导出功能 曹鹏飞 2026-01-16 16:19:13 +0800
  • 81d10ba5d1 refactor(department): 优化部门层级绑定逻辑并添加部门属性 曹鹏飞 2026-01-16 15:57:44 +0800
  • 5bf26c76d5 Merge branch 'feature/gongfu' into feature/data-permission 曹鹏飞 2026-01-16 15:16:49 +0800
  • 142b47f91f refactor(customer): 优化代理商公司同步逻辑,按公司名称和编码排重,任一个相同责认为是相同的记录,会覆盖旧记录 曹鹏飞 2026-01-16 15:15:29 +0800
  • d1062d72f5 1、用户和app用户添加报价人代码的内容; 2、添加编码生成规则 3、区域添加一个报价代码的字段 zhangke 2026-01-16 15:04:13 +0800
  • 5ea168155f feat(admin): 实现管理员账号搜索功能优化 曹鹏飞 2026-01-16 13:54:05 +0800
  • e3ce76f466 Merge branch 'feature/gongfu' into feature/quotation 曹鹏飞 2026-01-16 10:12:12 +0800
  • c419437853 Merge branch 'feature/data-permission' into feature/quotation 曹鹏飞 2026-01-16 10:11:59 +0800
  • 591d9cd518 fix(admin): 修复管理员用户服务中的返回值问题 曹鹏飞 2026-01-16 10:11:16 +0800
  • d0d78d54c6 feat(filter): 更新白名单并优化设备类型查询性能 prod/20260115 曹鹏飞 2026-01-16 09:21:57 +0800
  • fbea0c26a6 feat(admin): 添加新搜索账号功能和用户管理相关字段 曹鹏飞 2026-01-15 18:01:37 +0800
  • a134b18dc5 Merge branch 'refs/heads/feature/gongfu' into feature/data-permission 曹鹏飞 2026-01-15 15:55:26 +0800
  • 27d6fe13e8 feat(AppUserMapper): 添加用户类型字段映射 曹鹏飞 2026-01-15 15:54:39 +0800