vertoryao
|
5e508a5db2
|
fix(菜单模块): 处理合并代码的报错
|
2024-12-26 09:50:32 +08:00 |
|
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 |
|
vertoryao
|
6a1fcc9871
|
feat(菜单模块): 优化菜单模块
|
2024-12-20 14:53:56 +08:00 |
|
|
|
1e9bf7ec46
|
feat(iot): 新增设备和事件相关功能
- 新增设备相关实体、DTO、控制器、服务、仓库等
- 新增事件相关实体、DTO、控制器、服务、仓库等
- 移除了一些未使用的旧代码
- 添加了fastjson依赖
|
2024-12-09 18:08:42 +08:00 |
|
vertoryao
|
dc52d7701d
|
first update
|
2024-11-29 17:05:19 +08:00 |
|
vertoryao
|
2cebdf5895
|
first update
|
2024-11-01 17:19:12 +08:00 |
|
