Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -50,7 +50,7 @@
        CorsConfiguration config = new CorsConfiguration();
        config.setAllowCredentials(true);
        // 设置访问源地址
        config.addAllowedOrigin("*");
      config.addAllowedOriginPattern("*");
        // 设置访问源请求头
        config.addAllowedHeader("*");
        // 设置访问源请求方法