Merge branch 'master' into 2020.07.12 --- fix1

APP/src/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl

@@ -635,49 +635,6 @@ export default class ${srfclassname('${item.getCodeName()}')}ServiceBase extends
     <@local_supply item=item singleAppMethod=singleAppMethod />
     <#-- 无实体行为，有接口走接口，无接口走本地供数 end -->
     </#if>
-    </#if>  -->
-    <#-- 检查行为是否可以执行 end -->
-    <#--  <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
-        <#list 1..item.getPSAppDERSPathCount() as count>
-        <#assign path = ''/>
-        <#assign condition = ''/>
-        <#list item.getPSAppDERSPath(count_index)  as deRSPath>
-            <#if deRSPath.getMajorPSAppDataEntity?? && deRSPath.getMajorPSAppDataEntity()??>
-                <#assign _dataEntity = deRSPath.getMajorPSAppDataEntity()/>
-                <#assign condition>${condition}context.${_dataEntity.getCodeName()?lower_case} && </#assign>
-                <#assign path>${path}${srfpluralize(_dataEntity.codeName)?lower_case}/<#noparse>$</#noparse>{context.${_dataEntity.getCodeName()?lower_case}}/</#assign>
-            </#if>
-        </#list>
-        if(${condition}true){
-            let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().post(`/${path}${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
-        }
-        </#list>
-    </#if>
-    <#if item.isMajor()>
-        let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().post(`/${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
-    </#if>
-    }
-    </#if>  -->
-    <#-- 查询数据集(post方式)end -->
-    <#-- 检查行为是否可以执行 start -->
-    <#-- @author zpc -->
-    <#-- @update 2020.7.13 17:00 -->
-    <#if singleAppMethod.getPSDEAction()??>
-    <#assign appdeAction = singleAppMethod.getPSDEAction() />
-    <#if appdeAction.getTestActionMode?? && appdeAction.getTestActionMode()?? && (appdeAction.getTestActionMode() == 1 || appdeAction.getTestActionMode() == 3)>
-    
-    /**
-     * test${srfclassname('${singleAppMethod.getCodeName()}')}方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @returns {Promise<any>}
-     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
-     */
-    <@getTestActionModifier appdeAction=appdeAction/> async test${srfclassname('${singleAppMethod.getCodeName()}')}(context: any = {},data: any = {}): Promise<any> {
-        return true;
     }
     <#-- 检查行为是否可以执行 start -->
     <#-- @author zpc -->