Merge branch 'dev' --- fix1

@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl

@@ -20,11 +20,12 @@ import ${engine.getEngineType()}Engine from '@engine/${engine.getEngineCat()?low
 <#assign curAppEntity = uiAction.getPSAppDataEntity()/>
 <#if !P.exists("importService", curAppEntity.getId(), "")>
 import ${srfclassname('${curAppEntity.getCodeName()}')}UIService from '@/uiservice/${srffilepath2(curAppEntity.getCodeName())}/${srffilepath2(curAppEntity.getCodeName())}-ui-service';
+<#if appde?? && (curAppEntity.getId() == appde.getId())><#assign hasAppDE = true /></#if>
 </#if>
 </#if>
 </#list>
 </#if>
-<#if appde??>
+<#if appde?? && !hasAppDE??>
 import ${srfclassname('${appde.getCodeName()}')}UIService from '@/uiservice/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-ui-service';
 </#if>
 <#if import_block??>