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

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

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

@@ -51,7 +51,8 @@
         .build()
         /* 设置安全模式，swagger可以设置访问token */
         .securitySchemes(securitySchemes())
         .securityContexts(securityContexts());
         .securityContexts(securityContexts())
         .pathMapping(swaggerProperties.getPathMapping());
   }

   /**