Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-10-26 61375c4bbbcc2966f49c367b39a96f0157578b95

 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml

@@ -93,6 +93,18 @@
               </execution>
            </executions>
         </plugin>
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-resources-plugin</artifactId>
            <configuration>
               <nonFilteredFileExtensions>
                  <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
                  <nonFilteredFileExtension>jks</nonFilteredFileExtension>
                  <nonFilteredFileExtension>woff</nonFilteredFileExtension>
                  <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
               </nonFilteredFileExtensions>
            </configuration>
         </plugin>
         <!-- docker -->
         <plugin>
            <groupId>com.spotify</groupId>