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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

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

@@ -1,9 +1,9 @@
package com.alibaba.easyexcel.test.util;
package com.panzhihua.common.utlis;

import java.io.File;
import java.io.InputStream;

public class TestFileUtil {
public class FileUtil {


    public static InputStream getResourcesFileInputStream(String fileName) {
@@ -11,7 +11,7 @@
    }

    public static String getPath() {
        return TestFileUtil.class.getResource("/").getPath();
        return FileUtil.class.getResource("/").getPath();
    }

    public static File createNewFile(String pathName) {