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 |
|