From c565deb6ad9903ddc7fb09647adf4fc2cc31ef49 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期一, 27 二月 2023 17:21:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/service/data/UploadService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index dd49923..6fd4452 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -75,7 +75,7 @@
}
/**
- * 妫�鏌ユ簮鏁版嵁鏂囦欢
+ * 妫�鏌ュ厓鏁版嵁鏂囦欢
*/
private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
Timestamp createTime = WebHelper.getCurrentTimestamp();
@@ -121,7 +121,7 @@
}
/**
- * 鑾峰彇Excel婧愭暟鎹枃浠�
+ * 鑾峰彇Excel鍏冩暟鎹枃浠�
*/
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
@@ -138,7 +138,7 @@
}
/**
- * 鑾峰彇Excel鐨勬簮鏁版嵁
+ * 鑾峰彇Excel鐨勫厓鏁版嵁
*/
private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
List<String> pathList = new ArrayList<>();
@@ -518,7 +518,7 @@
}
/**
- * 鎻掑叆婧愭暟鎹�
+ * 鎻掑叆鍏冩暟鎹�
*/
private void insertMetas(List<MetaFileEntity> list) {
int metaId = insertParentMeta(list);
@@ -535,7 +535,7 @@
}
/**
- * 鍒涘缓婧愭暟鎹�
+ * 鍒涘缓鍏冩暟鎹�
*/
private MetaEntity createMeta(MetaFileEntity mf, int metaId) {
MetaEntity me = new MetaEntity();
@@ -563,7 +563,7 @@
}
/**
- * 鎻掑叆鐖舵簮鏁版嵁
+ * 鎻掑叆鐖跺厓鏁版嵁
*/
private int insertParentMeta(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
--
Gitblit v1.9.3