From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java
index d4665b4..f0fe765 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java
+++ b/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) {
--
Gitblit v1.7.1