Commit Graph

415 Commits

Author SHA1 Message Date
曹鹏飞 ba7c4f2a34 fix: 移除不需要的代码 2025-03-05 20:18:06 +08:00
曹鹏飞 d0910837b6 Merge remote-tracking branch '惠信/develop' into develop 2025-03-05 19:06:17 +08:00
曹鹏飞 5370a20d4a fix: 修复一些问题 2025-03-05 19:06:11 +08:00
大米 aa6ca8aa56 Merge remote-tracking branch 'origin/develop' into develop 2025-03-05 08:54:06 +08:00
大米 55357d1cbf 机型部件可清空 2025-03-05 08:53:51 +08:00
曹鹏飞 b42f3fe529 fix: 修复一些问题 2025-03-04 23:34:01 +08:00
luolm c165d91f99 机型部件导入-创建人问题 2025-03-04 21:55:04 +08:00
曹鹏飞 935d8a5f79 fix: 完成工单和关闭工单向创建人推送聊天消息 2025-03-04 20:35:22 +08:00
曹鹏飞 aca359088d fix: 修复一些问题 2025-03-04 19:25:32 +08:00
曹鹏飞 9da6db4960 Merge remote-tracking branch '惠信/develop' into develop 2025-03-04 16:10:06 +08:00
曹鹏飞 521bb78948 fix: 修复一些问题 2025-03-04 16:10:02 +08:00
大米 ad712d7f2e bug修复 2025-03-04 15:13:34 +08:00
曹鹏飞 33317cbdc6 fix: 修复一些问题 2025-03-03 21:13:01 +08:00
大米 e843fde8c9 客户管理-支持多区域 2025-03-03 18:39:50 +08:00
曹鹏飞 e99b00fa89 Merge remote-tracking branch '惠信/develop' into develop 2025-03-03 14:52:04 +08:00
曹鹏飞 fba5088e8b fix: bug-648
字典删除时,字典值的内容和字典值的翻译列表没有删除
2025-03-03 14:51:59 +08:00
大米 e072a4bf00 新增时无需修改时间 2025-03-03 14:40:41 +08:00
luolm b4ebdd7073 部件管理-新增 2025-03-02 22:02:52 +08:00
luolm e495710f2a 部件管理-新增 2025-03-02 17:08:26 +08:00
luolm fdd46a5f04 部件管理-新增 2025-03-02 16:50:09 +08:00
luolm 871ec75652 Merge remote-tracking branch 'origin/develop' into develop 2025-03-02 15:24:56 +08:00
luolm 6a66ac7048 部件管理-设备机型改造 2025-03-02 15:24:46 +08:00
曹鹏飞 873af20e90 Merge branch 'develop' of http://112.74.186.154:3000/nflg/mobilebroken into develop 2025-03-02 10:12:03 +08:00
曹鹏飞 7684461953 feat: 关注工单支持收藏夹 2025-03-02 10:00:30 +08:00
luolm a7733755f1 部件管理-设备机型改造 2025-03-01 23:12:33 +08:00
曹鹏飞 0112f267e3 feat: 导出工单PDF优化 2025-02-28 22:31:37 +08:00
曹鹏飞 bf75099c8b feat: sse服务优化 2025-02-28 14:27:10 +08:00
曹鹏飞 4dfe32bff8 feat: sse服务优化 2025-02-26 20:22:19 +08:00
曹鹏飞 02667a58be feat: sse独立出来 2025-02-25 20:54:11 +08:00
曹鹏飞 d0e6a54bf0 feat: 一些调整 2025-02-25 14:08:07 +08:00
曹鹏飞 3a3220d7d3 feat: 一些调整 2025-02-24 23:42:41 +08:00
曹鹏飞 ed316c7925 feat: 聊天列表添加未读信息 2025-02-24 11:44:59 +08:00
曹鹏飞 17cfb848be feat: 一些调整 2025-02-24 00:02:33 +08:00
曹鹏飞 34c71b34b2 feat: 一些调整 2025-02-23 20:51:17 +08:00
曹鹏飞 f66580cb75 feat: 修改密码邮件内容从字典获取 2025-02-23 13:22:07 +08:00
曹鹏飞 b6a0c52313 feat: 添加变更邮箱接口 2025-02-23 13:01:18 +08:00
曹鹏飞 15f80717ab Merge remote-tracking branch '惠信/develop' into develop 2025-02-22 23:16:04 +08:00
曹鹏飞 0fbc9000f7 feat: 一些调整 2025-02-22 23:15:54 +08:00
luolm ca94644055 Merge remote-tracking branch 'origin/develop' into develop 2025-02-22 22:19:08 +08:00
luolm 74bb9378f9 BUG修复 2025-02-22 22:18:59 +08:00
大米 e3fa535b95 设备质保状态-定时任务 2025-02-22 18:19:29 +08:00
luolm de9ad3337c Merge remote-tracking branch 'origin/develop' into develop 2025-02-21 22:33:24 +08:00
luolm 912332c1bf cqm 2025-02-21 22:32:11 +08:00
曹鹏飞 da7331309d feat: 一些调整 2025-02-21 20:26:20 +08:00
曹鹏飞 507b2e085d feat: 一些调整 2025-02-21 16:14:14 +08:00
luolm 0965ba1b2d BUG修复 2025-02-20 22:30:39 +08:00
曹鹏飞 e41216f9c4 feat: 一些调整 2025-02-20 20:43:55 +08:00
曹鹏飞 0224018087 feat: 一些调整 2025-02-19 20:07:23 +08:00
曹鹏飞 dd3030050a feat: 一些调整 2025-02-19 19:13:45 +08:00
曹鹏飞 5ff942e29a feat: 一些调整 2025-02-19 15:37:49 +08:00
曹鹏飞 08652de12a Merge remote-tracking branch '惠信/develop' into develop 2025-02-18 22:54:58 +08:00
曹鹏飞 37b0b4e8f7 feat: 一些调整 2025-02-18 22:54:48 +08:00
luolm 62e675e1fd 部门,职位编码自动生成 2025-02-18 22:44:17 +08:00
曹鹏飞 7b7ddb66c6 feat: 一些调整 2025-02-18 17:21:32 +08:00
曹鹏飞 d1244064a6 feat: 一些调整 2025-02-18 13:24:23 +08:00
luolm 97eab2afa0 Merge remote-tracking branch 'origin/develop' into develop 2025-02-17 22:32:15 +08:00
luolm ece69c8750 BUG修复 2025-02-17 22:32:02 +08:00
曹鹏飞 fd8912351d feat: 一些调整 2025-02-17 20:51:37 +08:00
曹鹏飞 44281ff108 feat: 一些调整 2025-02-17 01:10:26 +08:00
曹鹏飞 b106b431e5 feat: 一些调整 2025-02-17 00:07:59 +08:00
曹鹏飞 47038a8aeb Merge remote-tracking branch '惠信/develop' into develop 2025-02-16 23:03:53 +08:00
曹鹏飞 7d5e289692 feat: 一些调整 2025-02-16 23:03:45 +08:00
luolm 027bc4eedf 区域,公司id 改INT 2025-02-16 22:44:05 +08:00
曹鹏飞 f3179d65c5 feat: 一些调整 2025-02-16 21:06:08 +08:00
luolm 2eba102e28 区域,公司id 改INT 2025-02-16 20:38:00 +08:00
luolm 0cc6bebe99 区域,公司id 改INT 2025-02-16 20:24:15 +08:00
曹鹏飞 c3fdc0f393 Merge remote-tracking branch '惠信/develop' into develop 2025-02-16 18:54:05 +08:00
曹鹏飞 b87d23ffaa feat: 一些调整 2025-02-16 18:53:55 +08:00
luolm 4f2d287367 bug修复 2025-02-16 16:46:24 +08:00
曹鹏飞 88bb491a55 feat: 一些调整 2025-02-15 22:15:32 +08:00
luolm bc58622536 部门删除 2025-02-15 19:06:06 +08:00
曹鹏飞 b480272178 Merge remote-tracking branch '惠信/develop' into develop 2025-02-15 16:46:46 +08:00
曹鹏飞 425e1d810f feat: 一些调整 2025-02-15 16:46:29 +08:00
luolm 0ac1420b81 Merge remote-tracking branch 'origin/develop' into develop 2025-02-15 16:41:16 +08:00
luolm 01664d1cbc BUG修复 2025-02-15 16:41:09 +08:00
曹鹏飞 15850ea094 Merge remote-tracking branch '惠信/develop' into develop 2025-02-15 15:13:12 +08:00
曹鹏飞 369cdea8ee feat: 一些调整 2025-02-15 15:08:59 +08:00
luolm 60f35138bb BUG修复 2025-02-15 14:51:30 +08:00
luolm 155b47e2c9 Merge remote-tracking branch 'origin/develop' into develop 2025-02-14 23:18:46 +08:00
luolm 1ec9b93166 BUG修改 2025-02-14 23:18:35 +08:00
曹鹏飞 ee02a03772 fix: 修复工单消息的一些问题 2025-02-14 19:39:02 +08:00
曹鹏飞 7e58f808cc feat: 一些调整 2025-02-14 19:17:49 +08:00
曹鹏飞 36b1d04197 feat: 一些调整 2025-02-14 17:00:34 +08:00
luolm 1b68810732 设备修改 2025-02-13 23:00:23 +08:00
luolm 5c9979f7b2 设备修改 2025-02-13 23:00:00 +08:00
luolm 25f6282920 Merge remote-tracking branch 'origin/develop' into develop 2025-02-13 22:44:02 +08:00
luolm 959c5bb392 设备修改 2025-02-13 22:43:52 +08:00
曹鹏飞 fc6434194c feat: 一些调整 2025-02-13 22:33:33 +08:00
luolm a4c77edd42 部门-调整 2025-02-13 21:26:15 +08:00
大米 5ef583fa8f 客户-设备同步CRM 数据 2025-02-13 17:12:42 +08:00
曹鹏飞 7d43b5891f feat: 一些调整 2025-02-13 14:11:41 +08:00
曹鹏飞 eaa887e417 feat: 一些调整 2025-02-12 16:58:48 +08:00
曹鹏飞 0fe44a2fbe feat: 一些调整 2025-02-12 13:02:48 +08:00
曹鹏飞 95dcd856e3 feat: 一些调整 2025-02-11 22:42:46 +08:00
曹鹏飞 1f7e2ca89d feat: 一些调整 2025-02-11 17:21:13 +08:00
曹鹏飞 cfc9b461da feat: 一些调整 2025-02-11 11:21:20 +08:00
曹鹏飞 6bdc334c91 feat: 一些调整 2025-02-10 19:03:44 +08:00
曹鹏飞 14c4d7f2cd feat: 一些调整 2025-02-09 23:49:05 +08:00
曹鹏飞 51eefc8e9d feat: 一些调整 2025-02-09 17:10:44 +08:00
luolm 40a19e2e23 部门-调整 2025-02-09 11:39:45 +08:00
luolm f0b44ad060 部门-调整 2025-02-09 11:30:01 +08:00
luolm 92134db503 日志-调整 2025-02-09 11:09:36 +08:00
luolm 78be5a048f 清除查询上的日志 2025-02-08 22:14:57 +08:00
luolm dc3c75a62c 日志清除 2025-02-08 22:10:51 +08:00
曹鹏飞 be2f5bf5b5 feat: 一些调整 2025-02-08 19:14:57 +08:00
曹鹏飞 59ffff943c feat: 一些调整 2025-02-08 19:00:06 +08:00
曹鹏飞 23b6a87999 feat: 一些调整 2025-02-08 18:26:09 +08:00
曹鹏飞 37ed0275e4 feat: 一些调整 2025-02-07 20:09:52 +08:00
大米 c48a5c34be Merge remote-tracking branch 'origin/develop' into develop 2025-02-07 16:37:27 +08:00
大米 a636535dc0 客户管理加-负责人查询 2025-02-07 16:37:09 +08:00
曹鹏飞 a78e185378 feat: 一些调整 2025-02-07 10:58:29 +08:00
大米 8df67903e3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java
2025-02-07 10:45:16 +08:00
大米 20b27b6e0c 区域管理-启用or 禁用 2025-02-07 10:43:36 +08:00
luolm 6a060d14c2 客户修改 2025-02-06 23:06:50 +08:00
luolm 13d6882c76 职位管理& 区域管理 2025-02-06 22:43:55 +08:00
luolm 66963b748f Merge remote-tracking branch 'origin/develop' into develop 2025-02-06 21:09:39 +08:00
luolm cb22f0c434 职位管理 2025-02-06 21:08:22 +08:00
曹鹏飞 2c85fcff65 feat: 一些调整 2025-02-06 17:51:47 +08:00
大米 a7487dcafa 区域管理 2025-02-06 17:35:19 +08:00
大米 3f44dae2e6 区域管理 2025-02-06 17:12:11 +08:00
大米 36fe985f26 机型部件-优化 2025-02-06 14:48:45 +08:00
大米 54fd6efe04 机型部件 2025-02-06 14:40:20 +08:00
曹鹏飞 58a3d12fce feat: 一些调整 2025-02-06 13:19:24 +08:00
大米 d22fe7edec 部门管理-删除 2025-02-06 11:01:30 +08:00
大米 5d5800eb1b 部门管理 2025-02-06 10:36:08 +08:00
曹鹏飞 efb81f7cc6 Merge remote-tracking branch '惠信/develop' into develop 2025-02-06 09:24:38 +08:00
luolm 1cde6c4ad2 Merge remote-tracking branch 'origin/develop' into develop 2025-02-05 23:06:30 +08:00
luolm e5a118c462 部门管理 2025-02-05 23:06:22 +08:00
曹鹏飞 5684456193 feat: 一些调整 2025-02-05 22:00:07 +08:00
曹鹏飞 5f9543d097 perf: 添加功能 2025-02-05 17:24:07 +08:00
曹鹏飞 b3ec09148f perf: 添加功能 2025-02-05 13:14:52 +08:00
luolm 0187c28a91 获取设备列表 2025-02-04 22:36:11 +08:00
luolm efef85c89b 设备管理 ,部件管理 2025-02-04 22:09:54 +08:00
曹鹏飞 00fc420f96 perf: 优化sse推送 2025-02-03 16:13:44 +08:00
曹鹏飞 233cd58630 feat: 添加工单提醒任务 2025-02-03 16:01:20 +08:00
曹鹏飞 e9e9762424 feat: 添加MethodInfoMark信息 2025-02-03 14:09:04 +08:00
曹鹏飞 4091e676d7 feat: 优化参数校验 2025-02-03 13:53:47 +08:00
曹鹏飞 6d00705773 feat: 添加功能 2025-02-01 22:57:03 +08:00
曹鹏飞 ce86696383 Merge remote-tracking branch '惠信/develop' into develop 2025-01-27 22:34:49 +08:00
曹鹏飞 7758098974 feat: 添加功能 2025-01-27 22:34:35 +08:00
luolm 7921dfbb2d 客户管理导入 2025-01-27 20:01:00 +08:00
luolm 5d5e02994e Merge remote-tracking branch 'origin/develop' into develop 2025-01-27 20:00:01 +08:00
luolm 2302448a9e 客户管理导入 2025-01-27 19:59:47 +08:00
曹鹏飞 4dc5382f9c Merge remote-tracking branch '惠信/develop' into develop
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleButtonMap.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleMenuMap.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserRoleMap.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleButtonMapMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleMenuMapMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserRoleMapMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseCustomerMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleButtonMapService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleMenuMapService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserRoleMapService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleButtonMapServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleMenuMapServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserRoleMapServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java
#	nflg-mobilebroken-repository/src/main/resources/mapper/TBaseCustomerMapper.xml
2025-01-27 16:10:02 +08:00
曹鹏飞 3d84275a8c feat: 添加功能 2025-01-27 16:08:17 +08:00
luolm 1c90c9f62d 客户管理 2025-01-27 16:05:53 +08:00
曹鹏飞 f4dace2cc3 Merge remote-tracking branch '惠信/develop' into develop
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/FileUploadRecord.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponent.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponentTranslate.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentTranslateMapper.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentTranslateService.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentTranslateServiceImpl.java
#	nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml
2025-01-26 22:34:40 +08:00
曹鹏飞 8e1a59c743 feat: 添加功能 2025-01-26 22:27:16 +08:00
luolm 4998dcd2ee 日志管理 2025-01-26 20:08:56 +08:00
luolm 24c48ee42f 职位管理 2025-01-26 19:22:42 +08:00
luolm f707ee9a89 职位管理 2025-01-26 16:54:47 +08:00
luolm dc3f7e3fcc 设备管理 2025-01-25 23:34:55 +08:00
luolm a1d1fd5b07 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ParamConfig.java
2025-01-25 23:32:45 +08:00
luolm 8ad4b92b05 设备管理 2025-01-25 23:30:44 +08:00
曹鹏飞 2e021715fa feat: 添加功能 2025-01-25 23:11:05 +08:00
曹鹏飞 f802ee3375 perf: 重新生成数据库访问层 2025-01-25 14:59:50 +08:00
luolm b2bd4cdb10 部门管理
部件管理
区域管理
设备类型
2025-01-24 23:08:40 +08:00
luolm 28b54385df Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/TokenUtil.java
#	nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/config/MysqlDataSourceConfig.java
2025-01-24 22:28:15 +08:00
luolm 382c50d06a 部门管理
部件管理
区域管理
设备类型
2025-01-24 22:26:28 +08:00
曹鹏飞 38bb1e681c feat: 调整客户端接口;管理端接口添加字典相关接口 2025-01-23 21:04:06 +08:00
大米 aaf467d327 部门管理 2025-01-20 17:26:20 +08:00
大米 1df75ad211 Merge branch 'DM/基础信息维护' into develop 2025-01-20 10:54:42 +08:00
大米 c43543c185 ere 2025-01-20 10:48:03 +08:00
曹鹏飞 131dc542fa feat: 使管理端服务能运行;数据库访问添加对字典、字典值、字典值翻译的支持 2025-01-20 10:00:46 +08:00
曹鹏飞 11975d5c18 feat: 初始化 2025-01-19 11:30:15 +08:00