Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

23 小时以前 40256f8df6a3f8419e8e259b23281ddcb6920e5c

 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;