曹鹏飞
|
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 |
|
曹鹏飞
|
5296aab048
|
feat: 一些调整
|
2025-02-15 21:50:04 +08:00 |
|
luolm
|
bc58622536
|
部门删除
|
2025-02-15 19:06:06 +08:00 |
|
曹鹏飞
|
12ccd21279
|
feat: 一些调整
|
2025-02-15 18:49:35 +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 |
|
曹鹏飞
|
0607c578e0
|
feat: 代理商主账号续期时，子账号的过期时间不变
|
2025-02-14 19:30:56 +08:00 |
|
曹鹏飞
|
7e58f808cc
|
feat: 一些调整
|
2025-02-14 19:17:49 +08:00 |
|
曹鹏飞
|
36b1d04197
|
feat: 一些调整
|
2025-02-14 17:00:34 +08:00 |
|
曹鹏飞
|
fc6434194c
|
feat: 一些调整
|
2025-02-13 22:33:33 +08:00 |
|
曹鹏飞
|
1e30e82316
|
feat: 一些调整
|
2025-02-13 14:51:17 +08:00 |
|
曹鹏飞
|
7d43b5891f
|
feat: 一些调整
|
2025-02-13 14:11:41 +08:00 |
|
曹鹏飞
|
7690c9128e
|
feat: 一些调整
|
2025-02-12 20:30:31 +08:00 |
|
曹鹏飞
|
b8ddd0d8d6
|
feat: 一些调整
|
2025-02-12 15:39:20 +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 |
|
曹鹏飞
|
14c4d7f2cd
|
feat: 一些调整
|
2025-02-09 23:49:05 +08:00 |
|
luolm
|
1a27a98803
|
部门-调整
|
2025-02-09 18:06:13 +08:00 |
|
曹鹏飞
|
2916192e4e
|
feat: 一些调整
|
2025-02-09 17:35:27 +08:00 |
|
曹鹏飞
|
51eefc8e9d
|
feat: 一些调整
|
2025-02-09 17:10:44 +08:00 |
|
luolm
|
f0b44ad060
|
部门-调整
|
2025-02-09 11:30:01 +08:00 |
|
luolm
|
4050c2b176
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-02-09 11:09:46 +08:00 |
|
luolm
|
92134db503
|
日志-调整
|
2025-02-09 11:09:36 +08:00 |
|
曹鹏飞
|
89b5ac2c4a
|
Merge remote-tracking branch '惠信/develop' into develop
|
2025-02-09 07:45:01 +08:00 |
|
luolm
|
dc3c75a62c
|
日志清除
|
2025-02-08 22:10:51 +08:00 |
|
曹鹏飞
|
816c07ca2f
|
feat: 一些调整
|
2025-02-08 19:19:48 +08:00 |
|
曹鹏飞
|
59ffff943c
|
feat: 一些调整
|
2025-02-08 19:00:06 +08:00 |
|
曹鹏飞
|
23b6a87999
|
feat: 一些调整
|
2025-02-08 18:26:09 +08:00 |
|
曹鹏飞
|
e2408d846f
|
feat: 一些调整
|
2025-02-07 21:07:54 +08:00 |
|
曹鹏飞
|
d733933fe1
|
feat: 一些调整
|
2025-02-07 20:44:10 +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
|
13d6882c76
|
职位管理& 区域管理
|
2025-02-06 22:43:55 +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 |
|
曹鹏飞
|
58a3d12fce
|
feat: 一些调整
|
2025-02-06 13:19:24 +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 |
|
曹鹏飞
|
148ff6dbb0
|
feat: 根据语言对应的时区返回时间
|
2025-02-05 18:19:51 +08:00 |
|
曹鹏飞
|
5f9543d097
|
perf: 添加功能
|
2025-02-05 17:24:07 +08:00 |
|
曹鹏飞
|
b3ec09148f
|
perf: 添加功能
|
2025-02-05 13:14:52 +08:00 |
|
luolm
|
efef85c89b
|
设备管理 ，部件管理
|
2025-02-04 22:09:54 +08:00 |
|
曹鹏飞
|
67b140318e
|
perf: 添加功能
|
2025-02-03 19:11:50 +08:00 |
|
曹鹏飞
|
808efac0bc
|
perf: 添加功能
|
2025-02-03 17:34:04 +08:00 |
|
曹鹏飞
|
233cd58630
|
feat: 添加工单提醒任务
|
2025-02-03 16:01:20 +08:00 |
|
曹鹏飞
|
6d00705773
|
feat: 添加功能
|
2025-02-01 22:57:03 +08:00 |
|
曹鹏飞
|
7758098974
|
feat: 添加功能
|
2025-01-27 22:34:35 +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 |
|
luolm
|
a8ba1912cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-27 12:04:54 +08:00 |
|
luolm
|
31a8fd9cb2
|
设备管理
|
2025-01-27 12:04:39 +08:00 |
|
曹鹏飞
|
f58d39ff5e
|
fix: 修复一些问题
|
2025-01-26 22:40:03 +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
|
aafbe10238
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# logs/mobilebroken-admin.log
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.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/ParamConfig.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java
|
2025-01-26 17:01:41 +08:00 |
|
luolm
|
f707ee9a89
|
职位管理
|
2025-01-26 16:54:47 +08:00 |
|
曹鹏飞
|
a55e35ab24
|
refactor: 移除不需要的表
|
2025-01-26 08:42:53 +08:00 |
|
曹鹏飞
|
47fa0d2bd7
|
refactor: 调整代码生成逻辑，避免无差异时的也生成提交代码
|
2025-01-26 08:41:18 +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 |
|
曹鹏飞
|
39bf80baad
|
refactor: 修改客户端消息功能实现；移除不再需要的实体和相关数据库访问层类
|
2025-01-25 15:15:30 +08:00 |
|
曹鹏飞
|
f802ee3375
|
perf: 重新生成数据库访问层
|
2025-01-25 14:59:50 +08:00 |
|
曹鹏飞
|
5f49260837
|
build: 一些优化
|
2025-01-25 14:58:14 +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 |
 曹鹏飞
|
e0e4150e23
|
Merge remote-tracking branch '惠信/develop' into develop
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDepartmentMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDepartmentService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDepartmentServiceImpl.java
# nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml
|
2025-01-20 18:16:28 +08:00 |
|
曹鹏飞
|
be2de42902
|
feat: 一些优化
|
2025-01-20 18:14:34 +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 |
|
曹鹏飞
|
5c0f4ba91d
|
feat: 调整语言表结构和获取逻辑，移除不需要的代码
|
2025-01-20 08:53:52 +08:00 |
|
曹鹏飞
|
11975d5c18
|
feat: 初始化
|
2025-01-19 11:30:15 +08:00 |