Merge remote-tracking branch 'origin/master'

xuhy

11 小时以前 ae729b5af85b7df9aa9e2c0bb3e5fb6115f1ca9e

 ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java

@@ -13,7 +13,7 @@
 *
 * @author lihen
 */
@Configuration
//@Configuration
public class WxConfig {

    private final WeixinPayProperties weixinPayProperties;