diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
index 642886537c..7a7621cf9e 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
@@ -891,7 +891,11 @@
- ${invoiceName!}
+ <#if invoiceName??>
+ ${invoiceName!}
+ <#else> ${invoiceName!}
+ #if>
+
@@ -926,7 +930,7 @@
- ${Yf!}
+ ${Yf!}
@@ -979,7 +983,7 @@
- ${date!}
+ ${date!}
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
index 08f2adb5d2..956bbe90a4 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
@@ -1039,7 +1039,12 @@
- ${customerName!}
+ <#if customerName??>
+ ${customerName!}
+ <#else>
+
+ #if>
+
@@ -1102,7 +1107,12 @@
- ${idNo!}
+ <#if idNo??>
+ ${idNo!}
+ <#else>
+
+ #if>
+
@@ -1166,7 +1176,12 @@
- ${adds!}
+ <#if adds??>
+ ${adds!}
+ <#else>
+
+ #if>
+
@@ -1310,196 +1325,196 @@
<#if modelName??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${modelName!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${modelName!}
+
+
#if>
<#if modelConfig??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${modelConfig!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${modelConfig!}
+
+
#if>
<#if modelConfigs??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${modelConfigs!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${modelConfigs!}
+
+
#if>
<#if publicModel??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${publicModel!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${publicModel!}
+
+
#if>
<#if topName??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${topName!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${topName!}
+
+
#if>
<#if trailerName??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${trailerName!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${trailerName!}
+
+
#if>
<#if remarks??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${remarks!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${remarks!}
+
+
#if>
<#if discountDetail??>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${discountDetail!}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${discountDetail!}
+
+
#if>
@@ -1589,7 +1604,7 @@
- ${totalPrice!}
+ ${totalPrice!}
@@ -1632,7 +1647,7 @@
- ${priceRemarks!}
+ ${priceRemarks!}
@@ -1736,7 +1751,7 @@
- ${depositTotal!}
+ ${depositTotal!}
@@ -2361,7 +2376,8 @@
<#if invoiceName??>
${invoiceName!}
- <#else>
+ <#else>
+
#if>
@@ -2407,7 +2423,8 @@
<#if invoiceNo??>
${invoiceNo!}
- <#else>
+ <#else>
+
#if>
@@ -2486,6 +2503,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -2746,7 +2774,7 @@
-
+
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
index 6ac3664128..a4ad177723 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
@@ -1080,7 +1080,7 @@
- ${createOrgName!}
+ ${createOrgName!}
@@ -1707,7 +1707,7 @@
- ${totalPrice!}
+ ${totalPrice!}
@@ -1750,7 +1750,7 @@
- ${priceRemarks!}
+ ${priceRemarks!}
@@ -1835,7 +1835,7 @@
- ${dayOne!}
+ ${dayOne!}
@@ -1888,7 +1888,7 @@
- ${depositTotal!}
+ ${depositTotal!}
@@ -1993,7 +1993,7 @@
- ${address!}
+ ${address!}
@@ -2482,7 +2482,10 @@
- ${invoiceName!}
+ <#if invoiceName??>
+ ${invoiceName!}
+ <#else>
+ #if>
@@ -2525,7 +2528,10 @@
- ${invoiceNo!}
+ <#if invoiceNo??>
+ ${invoiceNo!}
+ <#else>
+ #if>
@@ -2577,6 +2583,13 @@
+
+
+
+
+
+
+
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
index 934a11b84b..a02b1d64eb 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
@@ -1166,7 +1166,11 @@
- ${customerName!}
+ <#if customerName??>
+ ${customerName!}
+ <#else>
+
+ #if>
@@ -1229,7 +1233,11 @@
- ${idNo!}
+ <#if idNo??>
+ ${idNo!}
+ <#else>
+
+ #if>
@@ -1287,13 +1295,17 @@
-
+
- ${adds!}
+ <#if adds??>
+ ${adds!}
+ <#else>
+
+ #if>
@@ -1707,7 +1719,7 @@
- ${totalPrice!}
+ ${totalPrice!}
@@ -1750,7 +1762,7 @@
- ${priceRemarks!}
+ ${priceRemarks!}
@@ -1835,7 +1847,7 @@
- ${dayOne!}
+ ${dayOne!}
@@ -1888,7 +1900,7 @@
- ${depositTotal!}
+ ${depositTotal!}
@@ -1993,7 +2005,7 @@
- ${address!}
+ ${address!}
@@ -2482,7 +2494,11 @@
- ${invoiceName!}
+ <#if invoiceName??>
+ ${invoiceName!}
+ <#else>
+
+ #if>
@@ -2525,7 +2541,11 @@
- ${invoiceNo!}
+ <#if invoiceNo??>
+ ${invoiceNo!}
+ <#else>
+
+ #if>
@@ -2556,7 +2576,7 @@
- ${invoiceType!}
+ ${invoiceType!}
@@ -2577,6 +2597,13 @@
+
+
+
+
+
+
+
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
index e037a2b821..0333a18738 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
@@ -772,7 +772,7 @@
- ${customerName!}
+ ${customerName!}
@@ -812,7 +812,11 @@
- ${idNo!}
+ <#if idNo??>
+ ${idNo!}
+ <#else>
+ #if>
+
@@ -893,7 +897,7 @@
- ${createOrgName!}
+ ${createOrgName!}
@@ -913,7 +917,7 @@
- ${contractNo!}
+ ${contractNo!}