Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

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

@@ -63,8 +63,8 @@
                .build()

                /* 设置安全模式，swagger可以设置访问token */

                .securitySchemes(securitySchemes())

                .securityContexts(securityContexts())

                .pathMapping(pathMapping);

                .securityContexts(securityContexts());

//                .pathMapping(pathMapping);

    }



    /**