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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/weixinUtil/WeixinServiceUtil.java

@@ -144,7 +144,6 @@
    */
   public JsApiPayComResData comPay(String desc, String outTradeNo,int totalFee, String openid,Long companyId){
      JsApiPayComResData result=null;
      //boolean flag=false;
      try {
         JsApiPayBusiness jsApiPayBusiness = new JsApiPayBusiness();
         // TODO 企业付款