Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子Li

2021-12-15 9e5b64e1b75ff8969e840011aced580c93721a20

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

@@ -102,6 +102,7 @@
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-resources-plugin</artifactId>
                <version>2.6</version>
            <configuration>
               <nonFilteredFileExtensions>
                  <nonFilteredFileExtension>ttf</nonFilteredFileExtension>