Merge branch 'dev'

@MACRO/LANG_FUN.ftl

@@ -33,7 +33,8 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                   {
                       type:"<#if condItem.getCondType?? && condItem.getCondType()??>${condItem.getCondType()}</#if>",
                       condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
-                      ruleInfo:`<#noparse>${</#noparse>this.$t('entities.${curAppEntity.getCodeName()?lower_case}.derules.${deRule.getCodeName()?lower_case}<#if condItem.getDEFName?? && condItem.getDEFName()??>${condItem.getDEFName()?lower_case}</#if>${condItem.getCondType()?lower_case}')<#noparse>}</#noparse>`, 
+                      ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
+                      <#--  ruleInfo:`<#noparse>${</#noparse>this.$t('entities.${curAppEntity.getCodeName()?lower_case}.derules.${deRule.getCodeName()?lower_case}<#if condItem.getDEFName?? && condItem.getDEFName()??>${condItem.getDEFName()?lower_case}</#if>${condItem.getCondType()?lower_case}')<#noparse>}</#noparse>`,   -->
                       isKeyCond:<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>,
                       <#if condItem.getParamValue?? && condItem.getParamValue()??>
                       paramValue:"${condItem.getParamValue()}",

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_en_US_base.ts.ftl

@@ -29,7 +29,7 @@ function getLocaleResourceBase(){
 		},
 	</#if>
 	<#--  属性值规则输出  -->
-	<#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
+	<#--  <#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
 		derules:{
 	<#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>
 	<#if deValueRule?? && (deValueRule.isDefaultMode() == false)  && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
@@ -45,7 +45,7 @@ function getLocaleResourceBase(){
 	</#if>
 	</#list>
 		},
-	</#if>
+	</#if>  -->
 	<#--  实体视图输出  -->
 	<#if item.getAllPSAppViews()??>
 		views: {

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_zh_CN_base.ts.ftl

@@ -18,7 +18,7 @@ function getLocaleResourceBase(){
 	},
 	</#if>
 	<#--  属性值规则输出  -->
-	<#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
+	<#--  <#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
 		derules:{
 	<#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>
 	<#if deValueRule?? && (deValueRule.isDefaultMode() == false)  && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
@@ -34,7 +34,7 @@ function getLocaleResourceBase(){
 	</#if>
 	</#list>
 		},
-	</#if>
+	</#if>  -->
 	<#--  实体视图输出  -->
 	<#if item.getAllPSAppViews()??>
 		views: {