Commit Graph

274 Commits

Author SHA1 Message Date
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