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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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 位