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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 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");