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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/paramProtocol/BrandWCPayRequestData.java

@@ -25,7 +25,7 @@
    private String signType = "";
    private String paySign = "";
    
    public BrandWCPayRequestData(String prepay_id,String appID,String paySecret){
    public BrandWCPayRequestData(String prepay_id, String appID, String paySecret){
       //默认必须设置
        setAppId(appID);
        //随机字符串，不长于32 位