Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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