Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java

@@ -92,8 +92,8 @@
                  throw new GlobleException(e.getMessage());
               }
               JSONObject json = JSONObject.fromObject(result.getDataString());
               String errmsg=json.getString("errmsg");
               if(StringUtils.isNotBlank(errmsg)){

               if(json.has("errmsg")){
                  throw new GlobleException("获取返回刷新的accessToken失败"+json.toString());
               }else{
                  String access_token = json.getString("access_token");