Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 945123b11d6179d9f496a195c271122ff08bc1bc

 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;