From caa81d1f4dbb0f608b7a6848e673eca2c4a69d10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 五月 2021 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-admin/pom.xml |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2d4465a..e51c7da 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -24,11 +24,6 @@
             <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
         </dependency>
 
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-
          <!-- Mysql椹卞姩鍖� -->
         <dependency>
             <groupId>mysql</groupId>
@@ -88,25 +83,7 @@
                     <warName>${project.artifactId}</warName>
                 </configuration>   
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
-                <directory>src/main/resources</directory>
-                <!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
 
 </project>
\ No newline at end of file

--
Gitblit v1.9.3