解决冲突

d02fdf21 · yao.xiao · d201f492 · d02fdf21
Commit d02fdf21 authored May 22, 2020 by yao.xiao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
+0 -1

No files found.
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
@@ -19,7 +19,6 @@ import com.yd.api.practitioner.vo.salestarget.*;
 import com.yd.api.practitioner.vo.setting.*;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.customer.*;
-import com.yd.dal.entity.insurer.AclInsurerBranchDept;
 import com.yd.dal.entity.marketing.*;
 import com.yd.dal.entity.meta.*;
 import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;