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
..
src/main	Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev	2022-06-22 15:53:36 +08:00
pom.xml	测试	2022-06-22 15:43:23 +08:00