属性值规则 长度包含参数 -- fix2

@MACRO/LANG_FUN.ftl

@@ -32,6 +32,9 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
 <#macro getDeRule condItem>
                   {
                       type:"<#if condItem.getCondType?? && condItem.getCondType()??>${condItem.getCondType()}</#if>",
+                      condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
+                      ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
+                      isKeyCond:<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>,
                       <#if condItem.getParamValue?? && condItem.getParamValue()??>
                       paramValue:"${condItem.getParamValue()}",
                       </#if>
@@ -53,14 +56,17 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       <#if condItem.getDEFName?? && condItem.getDEFName()??>
                       deName:"${condItem.getDEFName()?lower_case}",
                       </#if>
-                      condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
-                      ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
-                      isKeyCond:<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>,
+                      <#if condItem.isIncludeMaxValue?? && condItem.isIncludeMaxValue()??>
+                      isIncludeMaxValue:${condItem.isIncludeMaxValue()?c}
+                      </#if>
+                      <#if condItem.isIncludeMinValue?? && condItem.isIncludeMinValue()??>
+                      isIncludeMinValue:${condItem.isIncludeMinValue()?c}
+                      </#if>
                       <#if condItem.getCondType?? && condItem.getCondType()?? && condItem.getCondType() == 'GROUP'>
                       group:[
                         <#if condItem.getPSDEFVRConditions?? && condItem.getPSDEFVRConditions()??>
                           <#list condItem.getPSDEFVRConditions() as group_item>
-                                <@getDeRule group_item />
+                                  <@getDeRule group_item />
                           </#list>
                         </#if>
                         ]