Merge remote-tracking branch 'origin/master'

This commit is contained in:
zer0Black
2021-12-01 21:03:36 +08:00
3 changed files with 10 additions and 6 deletions
@@ -58,10 +58,10 @@
<#elseif po.dictField?default("")?trim?length gt 1>
<#if query_field_no gt 1> </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" dictCode="${po.dictField}"/>
<#else>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
<#if query_field_no gt 1> </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
</#if>
<#else>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
<#if query_field_no gt 1> </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
</#if>
<#if query_field_no gt 1> </#if></a-form-item>
<#if query_field_no gt 1> </#if></a-col>