diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java
index 4d442566..f666fb3f 100644
--- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java
+++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java
@@ -303,6 +303,7 @@ public class ExcelTemplateALPHA {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         //整体填值
         for (int i = 0; i <= sheet.getLastRowNum(); i++) {
             XSSFRow row = sheet.getRow(i);
@@ -338,6 +339,8 @@ public class ExcelTemplateALPHA {
                             declarationFixedPriceCols.add(j);
                         } else if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
+                        } else if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
                         }
                     }
                 }
@@ -622,8 +625,11 @@ public class ExcelTemplateALPHA {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -915,6 +921,10 @@ public class ExcelTemplateALPHA {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private BigDecimal parseNumericString(String value) {
         if (value == null) {
             return null;
diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java
index 7c3152f8..e4052b1b 100644
--- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java
+++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java
@@ -308,6 +308,7 @@ public class ExcelTemplateTX {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         Set<Integer> packingVolumeCols = new HashSet<>();
         Set<Integer> packingNetWeightCols = new HashSet<>();
         //整体填值
@@ -345,6 +346,9 @@ public class ExcelTemplateTX {
                         if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
                         }
+                        if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
+                        }
                         if (isPackingVolumeField(dtlField)) {
                             packingVolumeCols.add(j);
                         }
@@ -652,8 +656,11 @@ public class ExcelTemplateTX {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -945,6 +952,10 @@ public class ExcelTemplateTX {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private boolean isPackingVolumeField(String field) {
         return "volume".equalsIgnoreCase(field);
     }
diff --git a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java
index 3b7d95a1..f8bec482 100644
--- a/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java
+++ b/src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java
@@ -305,6 +305,7 @@ public class ExcelTemplateYB {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         //整体填值
         for (int i = 0; i <= sheet.getLastRowNum(); i++) {
             XSSFRow row = sheet.getRow(i);
@@ -340,6 +341,8 @@ public class ExcelTemplateYB {
                             declarationFixedPriceCols.add(j);
                         } else if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
+                        } else if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
                         }
                     }
                 }
@@ -625,8 +628,11 @@ public class ExcelTemplateYB {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -918,6 +924,10 @@ public class ExcelTemplateYB {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private BigDecimal parseNumericString(String value) {
         if (value == null) {
             return null;
diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx
index 20ca1acf..8ee7a457 100644
Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ
diff --git a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx
index 03a9bbac..a861d469 100644
Binary files a/src/main/resources/templates/ALPHA/declaration-all-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template.xlsx differ
diff --git a/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx b/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx
index cfc62aa4..a05551c2 100644
Binary files a/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx and b/src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx differ
diff --git a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx
index 7f930f9b..f6724427 100644
Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx differ
diff --git a/src/main/resources/templates/TX/declaration-all-template.xlsx b/src/main/resources/templates/TX/declaration-all-template.xlsx
index 1a0c68c9..958bfe3b 100644
Binary files a/src/main/resources/templates/TX/declaration-all-template.xlsx and b/src/main/resources/templates/TX/declaration-all-template.xlsx differ
diff --git a/src/main/resources/templates/TX/declaration-packingList-template.xlsx b/src/main/resources/templates/TX/declaration-packingList-template.xlsx
index b9d22a62..a439bb9e 100644
Binary files a/src/main/resources/templates/TX/declaration-packingList-template.xlsx and b/src/main/resources/templates/TX/declaration-packingList-template.xlsx differ
diff --git a/src/main/resources/templates/TX/declaration-template.xlsx b/src/main/resources/templates/TX/declaration-template.xlsx
index 206930b0..cf580ae4 100644
Binary files a/src/main/resources/templates/TX/declaration-template.xlsx and b/src/main/resources/templates/TX/declaration-template.xlsx differ
diff --git a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx
index 6bef369c..ba6e60cc 100644
Binary files a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx differ
diff --git a/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx
index a0b30600..94ec105b 100644
Binary files a/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx and b/src/main/resources/templates/YB/declaration-all-template-invoice.xlsx differ
diff --git a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx
index 8f58eb4e..7eaa2eeb 100644
Binary files a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx differ
diff --git a/src/main/resources/templates/YB/declaration-all-template.xlsx b/src/main/resources/templates/YB/declaration-all-template.xlsx
index 5107ae26..f2887e3b 100644
Binary files a/src/main/resources/templates/YB/declaration-all-template.xlsx and b/src/main/resources/templates/YB/declaration-all-template.xlsx differ
diff --git a/src/main/resources/templates/YB/declaration-packingList-template.xlsx b/src/main/resources/templates/YB/declaration-packingList-template.xlsx
index b6924cee..e806df6b 100644
Binary files a/src/main/resources/templates/YB/declaration-packingList-template.xlsx and b/src/main/resources/templates/YB/declaration-packingList-template.xlsx differ