vertoryao 1eb01519ad Merge remote-tracking branch 'origin/feature/iot' into develop ... # Conflicts: # src/main/java/com/zsc/edu/gateway/FirstTimeInitializer.java # src/main/java/com/zsc/edu/gateway/framework/mybatisplus/MyMetaObjectHandler.java # src/main/java/com/zsc/edu/gateway/framework/security/JpaUserDetailsServiceImpl.java # src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java # src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java # src/main/java/com/zsc/edu/gateway/modules/system/entity/Authority.java # src/main/java/com/zsc/edu/gateway/modules/system/service/DeptService.java # src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java # src/main/resources/mappers/DeptMapper.xml # src/main/resources/mappers/RoleMapper.xml # src/main/resources/mappers/systemMappers/UserMapper.xml		2024-12-25 16:58:28 +08:00
..
iotMappers	refactor(iot): 重构 IoT 模块代码	2024-12-17 14:29:37 +08:00
noticeMappers	refactor(iot): 重构 IoT 模块代码	2024-12-17 14:29:37 +08:00
systemMappers	Merge remote-tracking branch 'origin/feature/iot' into develop	2024-12-25 16:58:28 +08:00
MenuMapper.xml	feat(菜单模块): 优化菜单模块	2024-12-24 17:12:19 +08:00
RoleMapper.xml	first update	2024-11-28 16:40:22 +08:00