Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 87c1e76403b09b137ad07abd75350a4b4cc23694

 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;