合并代码

Pu Zhibing

2024-11-06 73be7ff2317fea8194b7a6dc0452b64a511c7836

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/WeixinProperties.java

@@ -13,8 +13,7 @@
 */
@ToString
@Component
@ConfigurationProperties(prefix = "wx.conf")
@Data
@ConfigurationProperties(prefix = "payment.wx")
public class WeixinProperties {
    /**
     * 默认开启
@@ -104,4 +103,12 @@
    public void setMchId(String mchId) {
        this.mchId = mchId;
    }
    
    public String getCallBackUrl() {
        return callBackUrl;
    }
    
    public void setCallBackUrl(String callBackUrl) {
        this.callBackUrl = callBackUrl;
    }
}