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

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -20,16 +20,7 @@ public class RuoYiApplication
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println();
         System.out.println("                                                               --->>>启动成功！<<<---");
-//        System.out.println("(♥◠‿◠)ﾉﾞ    ლ(´ڡ`ლ)ﾞ  \n" +
+
-//                " .-------.       ____     __        \n" +
-//                " |  _ _   \\      \\   \\   /  /    \n" +
-//                " | ( ' )  |       \\  _. /  '       \n" +
-//                " |(_ o _) /      _( )_ .'         \n" +
-//                " | (_,_).' __  ___(_ o _)'          \n" +
-//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-//                " |  | \\ `'   /|   `-'  /           \n" +
-//                " |  |  \\    /  \\      /           \n" +
-//                " ''-'   `'-'    `-..-'              ");
     }
 
 }

ruoyi-ui/src/views/tool/swagger/index.vue

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <template>
   <i-frame :src="url" />
 </template>
@@ -14,3 +15,21 @@ export default {
   },
 };
 </script>
+=======
+<template>
+  <i-frame :src="url" />
+</template>
+<script>
+import iFrame from "@/components/iFrame/index";
+export default {
+  name: "Swagger",
+  components: { iFrame },
+  data() {
+    return {
+      // url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+      url: process.env.VUE_APP_BASE_API + "/doc.html"
+    };
+  },
+};
+</script>
+>>>>>>> 43ee95a198fd259c420f6370f4035895bfd4af3c