From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index f6912ff..2200dc4 100644
--- a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -4,13 +4,12 @@
import com.java110.boot.smo.assetImport.IImportOwnerRoomSMO;
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.entity.assetImport.ImportOwnerRoomDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.importData.ImportOwnerRoomDto;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IImportOwnerRoomInnerServiceSMO;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.CommonUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -231,7 +230,7 @@
Assert.hasValue(os[13], (osIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
// Assert.hasValue(os[14], (osIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
Assert.hasValue(os[14], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
- Assert.hasValue(os[15], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
+ //Assert.hasValue(os[15], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
Assert.hasValue(os[16], (osIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
}
--
Gitblit v1.8.0