曹鹏飞
|
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 |