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

---
 java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java
index 426612c..9c21d2f 100644
--- a/java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
 import com.java110.po.inspection.InspectionTaskDetailPo;
 import com.java110.po.inspection.InspectionTaskPo;
 import org.springframework.cloud.openfeign.FeignClient;

--
Gitblit v1.8.0