Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-20 c3fe137720594bbb6a709da1fda2614d268c5921

 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>