依赖冲突

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -66,7 +66,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     <#if de.getMajorPSDERs()??>
         <#list de.getMajorPSDERs() as der>
             <#if der.getDERType() =='DER1N' && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4)>
-                <#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())>
+                <#if !P.exists('DER1N',der.getMinorPSDataEntity().getCodeName())>
     @Autowired
     @Lazy
     private ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service;
@@ -79,7 +79,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     <#if de.getMinorPSDERs()??>
         <#list de.getMinorPSDERs() as der>
             <#if der.getDERType() =='DER1N' && (der.getMajorPSDataEntity().getStorageMode()==1||der.getMajorPSDataEntity().getStorageMode()==2||der.getMajorPSDataEntity().getStorageMode()==4)>
-                <#if !P.exists('DEMajorPSDataEntity',der.getMajorPSDataEntity().getCodeName())>
+                <#if !P.exists('DER1N',der.getMajorPSDataEntity().getCodeName())>
     @Autowired
     @Lazy
     private ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service;