From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突

---
 service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
index 94f4d77..f3e67b0 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java
@@ -6,8 +6,8 @@
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.PageDto;
-import com.java110.dto.inspectionPoint.InspectionDto;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.dto.inspectionPlan.InspectionDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
 import com.java110.intf.community.IInspectionInnerServiceSMO;
 import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;

--
Gitblit v1.8.0