Skip to content

A
amos-boot-biz
Commit 4724212d authored by 刘林's avatar 刘林
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 09ce26b8 a93547b4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl
View file @ 4724212d
......@@ -700,7 +700,11 @@
<w:sz-cs w:val="24"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(fullAddress)!''}</w:t>
<#if equDefineCode?? && equDefineCode == '23T0'>
<w:t>${(useUnitAddress)!''}</w:t>
<#else>
<w:t>${(fullAddress)!''}</w:t>
</#if>
</w:r>
</w:p>
</w:txbxContent>
......@@ -786,11 +790,7 @@
<w:sz-cs w:val="24"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<#if equDefineCode == "23T0">
<w:t>${(useUnitAddress)!''}</w:t>
<#else>
<w:t>${(useUnitName)!''}</w:t>
</#if>
</w:r>
</w:p>
</w:txbxContent>
......@@ -1024,7 +1024,7 @@
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
</w:rPr>
<#if equDefineCode == "23T0">
<#if equDefineCode?? && equDefineCode == '23T0'>
<w:t>使用单位地址：</w:t>
<#else>
<w:t>设备使用地点：</w:t>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment