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/InspectionTaskDetailInnerServiceSMOImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskDetailInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskDetailInnerServiceSMOImpl.java
index fa50e4a..8cd9050 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskDetailInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskDetailInnerServiceSMOImpl.java
@@ -6,7 +6,7 @@
 import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

--
Gitblit v1.8.0