songjinsheng 11b8a3db44 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev ... # Conflicts: # ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java # ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java # ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml # ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml # ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml # ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml # ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml # ruoyi-ui/src/views/tool/swagger/index.vue		2022-06-22 15:53:36 +08:00
..
api	修改单词拼写错误	2021-12-30 14:13:38 +08:00
assets	ui code format	2022-05-01 20:22:25 +08:00
components	topNav自定义隐藏侧边栏路由	2022-03-30 10:38:51 +08:00
directive	自定义文字复制剪贴指令	2021-12-09 09:56:11 +08:00
layout	添加新群号：167385320	2022-03-22 16:47:56 +08:00
plugins	添加页签openPage支持传递参数	2022-04-08 15:42:10 +08:00
router	开启TopNav没有子菜单情况隐藏侧边栏	2022-03-06 09:03:44 +08:00
store	优化固定Header后顶部导航栏样式问题(I4XDN5)	2022-03-17 09:42:39 +08:00
utils	页面若未匹配到字典标签则返回原字典值	2022-02-23 16:55:09 +08:00
views	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev	2022-06-22 15:53:36 +08:00
App.vue	系统布局配置支持动态标题开关	2021-06-10 18:05:27 +08:00
main.js	新增图片预览组件	2021-12-18 12:23:59 +08:00
permission.js	修改登录超时刷新页面跳转登录页面还提示重新登录问题	2022-02-17 17:16:11 +08:00
settings.js	系统布局配置支持动态标题开关	2021-06-10 18:05:27 +08:00