Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

infrasys00

2021-02-20 7a8f3a04acc14191820ff8a3d915ed4fb7a4ad69

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

@@ -154,7 +154,6 @@
            tempStr = new String(arrayOut.toByteArray());

        } catch (IOException e) {
// TODO Auto-generated catch block
            e.printStackTrace();
        }
        return tempStr;