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

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WeiXinOfficPayProperties.java

File was renamed from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WeiXinOfficPayProperties.java
@@ -1,4 +1,4 @@
package com.kidgrow.oprationcenter.config.weixin;
package com.kidgrow.oprationcenter.weixin;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -26,7 +26,7 @@
    /**
     * API证书绝对路径 (本项目放在了 resources/cert/wxpay/apiclient_cert.p12")
     */
    private String certPath;
//    private String certPath;

    /**
     * HTTP(S) 连接超时时间，单位毫秒