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

buhuazhen

9 天以前 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

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

@@ -35,7 +35,7 @@
        /** swagger配置 */

        registry.addResourceHandler("/swagger-ui/**")

                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")

                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;

                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());

    }



    /**

@@ -69,4 +69,5 @@
        // 返回新的CorsFilter

        return new CorsFilter(source);

    }



}