Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java

@@ -234,6 +234,7 @@
            while ((output = bufferedReader.readLine()) != null) {
                stringBuilder.append(output);
            }
            log.info("调用微信接口返回的参数：" + stringBuilder.toString());
            return stringBuilder.toString();
        } catch (IOException e) {
            e.printStackTrace();