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

diff --git a/service-api/src/main/java/com/java110/api/bmo/inspectionPlanStaff/impl/InspectionPlanStaffBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/inspectionPlanStaff/impl/InspectionPlanStaffBMOImpl.java
index 7e2d921..0f3eb64 100644
--- a/service-api/src/main/java/com/java110/api/bmo/inspectionPlanStaff/impl/InspectionPlanStaffBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/inspectionPlanStaff/impl/InspectionPlanStaffBMOImpl.java
@@ -5,7 +5,7 @@
 import com.java110.api.bmo.inspectionPlanStaff.IInspectionPlanStaffBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
-import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
+import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
 import com.java110.po.inspection.InspectionPlanStaffPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.Assert;

--
Gitblit v1.8.0