Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 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 位