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

---
 service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
index f097b16..a713dd1 100644
--- a/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java
@@ -4,8 +4,8 @@
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.inspectionTaskDetail.IInspectionTaskDetailBMO;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.community.IInspectionTaskDetailInnerServiceSMO;
-import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
+import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
+import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
 import com.java110.po.inspection.InspectionTaskDetailPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.Assert;

--
Gitblit v1.8.0