diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html
index 941c691..27c7dc2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html
@@ -1,22 +1,23 @@
 
 <!doctype html public "-//w3c//dtd xhtml 1.0 transitional//en" "http://www.w3.org/tr/xhtml1/dtd/xhtml1-transitional.dtd">
-<html>
-<!--        xmlns="http://www.w3.org/TR/REC-html40">-->
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+      xmlns:o="urn:schemas-microsoft-com:office:office"
+      xmlns:x="urn:schemas-microsoft-com:office:excel"
+      xmlns="http://www.w3.org/TR/REC-html40">
 
 <head>
     <th:block th:include="include :: header('密品打印')" />
     <meta http-equiv=Content-Type content="text/html; charset=utf-8">
     <meta name=ProgId content=Excel.Sheet>
     <meta name=Generator content="Aspose.Cell ">
-    <link rel=File-List href="at4e1-nctco_files/filelist.xml">
-    <link rel=Edit-Time-Data href="at4e1-nctco_files/editdata.mso">
-    <link rel=OLE-Object-Data href="at4e1-nctco_files/oledata.mso">
+    <link rel=File-List href="a8kdo-9r23u_files/filelist.xml">
+    <link rel=Edit-Time-Data href="a8kdo-9r23u_files/editdata.mso">
+    <link rel=OLE-Object-Data href="a8kdo-9r23u_files/oledata.mso">
     <!--[if gte mso 9]><xml>
     <o:DocumentProperties>
-        <o:Author>波强 赵</o:Author>
-        <o:LastPrinted>2024-05-16T01:00:20Z</o:LastPrinted>
-        <o:Created>2024-05-16T00:31:15Z</o:Created>
-        <o:LastSaved>2024-05-16T01:00:34Z</o:LastSaved>
+        <o:Author>pc</o:Author>
+        <o:Created>2024-08-21T20:29:35Z</o:Created>
+        <o:LastSaved>2024-08-21T20:35:40Z</o:LastSaved>
     </o:DocumentProperties>
 </xml><![endif]-->
     <style>
@@ -76,24 +77,38 @@
         .font2
         {
             color:#000000;
-            font-size:9pt;
+            font-size:11pt;
             font-weight:400;
-            font-style:normal;
+            font-style:italic;
             font-family:"等线","sans-serif"; }
         .font3
+        {
+            color:#000000;
+            font-size:11pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","sans-serif"; }
+        .font4
         {
             color:#000000;
             font-size:16pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace"; }
-        .font4
+            font-family:"等线","sans-serif"; }
+        .font5
         {
             color:#000000;
             font-size:20pt;
             font-weight:700;
             font-style:normal;
-            font-family:"等线","monospace"; }
+            font-family:"等线","sans-serif"; }
+        .font6
+        {
+            color:#000000;
+            font-size:9pt;
+            font-weight:400;
+            font-style:normal;
+            font-family:"宋体","monospace"; }
         td
         {mso-style-parent:style0;
             mso-number-format:General;
@@ -341,7 +356,7 @@
         {
             mso-number-format:"0%";
             text-align:general;
-            vertical-align:middle;
+            vertical-align:bottom;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
@@ -355,9 +370,9 @@
         }
         .style17
         {
-            mso-number-format:"_\(\0022$\0022* \#\,\#\#0\.00_\)\;_\(\0022$\0022* \(\#\,\#\#0\.00\)\;_\(\0022$\0022* \0022-\0022??_\)\;_\(\@_\)";
+            mso-number-format:"_ \0022¥\0022* \#\,\#\#0\.00_ \;_ \0022¥\0022* \\-\#\,\#\#0\.00_ \;_ \0022¥\0022* \0022-\0022??_ \;_ \@_ ";
             text-align:general;
-            vertical-align:middle;
+            vertical-align:bottom;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
@@ -371,9 +386,9 @@
         }
         .style18
         {
-            mso-number-format:"_\(\0022$\0022* \#\,\#\#0_\)\;_\(\0022$\0022* \(\#\,\#\#0\)\;_\(\0022$\0022* \0022-\0022_\)\;_\(\@_\)";
+            mso-number-format:"_ \0022¥\0022* \#\,\#\#0_ \;_ \0022¥\0022* \\-\#\,\#\#0_ \;_ \0022¥\0022* \0022-\0022_ \;_ \@_ ";
             text-align:general;
-            vertical-align:middle;
+            vertical-align:bottom;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
@@ -387,9 +402,9 @@
         }
         .style19
         {
-            mso-number-format:"_\(* \#\,\#\#0\.00_\)\;_\(* \(\#\,\#\#0\.00\)\;_\(* \0022-\0022??_\)\;_\(\@_\)";
+            mso-number-format:"_ * \#\,\#\#0\.00_ \;_ * \\-\#\,\#\#0\.00_ \;_ * \0022-\0022??_ \;_ \@_ ";
             text-align:general;
-            vertical-align:middle;
+            vertical-align:bottom;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
@@ -403,9 +418,9 @@
         }
         .style20
         {
-            mso-number-format:"_\(* \#\,\#\#0_\)\;_\(* \(\#\,\#\#0\)\;_\(* \0022-\0022_\)\;_\(\@_\)";
+            mso-number-format:"_ * \#\,\#\#0_ \;_ * \\-\#\,\#\#0_ \;_ * \0022-\0022_ \;_ \@_ ";
             text-align:general;
-            vertical-align:middle;
+            vertical-align:bottom;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
@@ -421,20 +436,20 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:center;
+            text-align:left;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
+            font-size:16pt;
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
+            border-top:none;
+            border-right:none;
+            border-bottom:1px solid #000000;
+            border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -443,20 +458,20 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:center;
+            text-align:general;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
+            font-size:16pt;
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
+            border-top:none;
             border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
+            border-bottom:1px solid #000000;
+            border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -465,7 +480,7 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:center;
+            text-align:general;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
@@ -475,9 +490,9 @@
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
+            border-top:none;
+            border-right:none;
+            border-bottom:1px solid #000000;
             border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
@@ -487,20 +502,20 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:center;
+            text-align:right;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:20pt;
-            font-weight:700;
+            font-size:16pt;
+            font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
+            font-family:"等线","sans-serif";
+            border-top:none;
             border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
+            border-bottom:1px solid #000000;
+            border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -515,19 +530,41 @@
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:20pt;
-            font-weight:700;
+            font-size:11pt;
+            font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
-            border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:none;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
         .x26
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:general;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:11pt;
+            font-weight:400;
+            font-style:normal;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:none;
+            border-bottom:none;
+            border-left:1px solid #000000;
+            mso-diagonal-down:none;
+            mso-diagonal-up:none;
+            mso-protection:locked visible;
+        }
+        .x27
         {
             mso-style-parent:style0;
             mso-number-format:General;
@@ -537,89 +574,149 @@
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:20pt;
+            font-size:11pt;
             font-weight:700;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
-            border-left:none;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x27
+        .x28
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:left;
+            text-align:general;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
+            font-size:11pt;
+            font-weight:400;
+            font-style:italic;
+            font-family:"等线","sans-serif";
+            mso-protection:locked visible;
+        }
+        .x29
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:general;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:11pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
-            border-right:none;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
             border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
+            border-left:1px solid #000000;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x28
+        .x30
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:left;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
+            font-size:11pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid windowtext;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
+            mso-diagonal-down:none;
+            mso-diagonal-up:none;
+            mso-protection:locked visible;
+        }
+        .x31
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:center;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:11pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
             border-right:none;
-            border-bottom:1px solid windowtext;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
+            mso-diagonal-down:none;
+            mso-diagonal-up:none;
+            mso-protection:locked visible;
+        }
+        .x32
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:center;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:11pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
             border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x29
+        .x33
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:general;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
+            font-size:11pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
             border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:none;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x30
+        .x34
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:general;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
@@ -629,19 +726,35 @@
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:none;
-            border-bottom:1px solid windowtext;
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
             border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x31
+        .x35
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:right;
+            text-align:center;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:20pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","sans-serif";
+            mso-protection:locked visible;
+        }
+        .x36
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:left;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
@@ -650,32 +763,55 @@
             font-size:16pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
+            font-family:"等线","sans-serif";
+            border-top:none;
             border-right:none;
-            border-bottom:1px solid windowtext;
+            border-bottom:1px solid #000000;
             border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x32
+        .x37
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:left;
+            text-align:general;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
+            font-size:11pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
-            border-top:1px solid windowtext;
-            border-bottom:1px solid windowtext;
-            border-left:none;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
+            mso-diagonal-down:none;
+            mso-diagonal-up:none;
+            mso-protection:locked visible;
+        }
+        .x38
+        {
+            mso-style-parent:style0;
+            mso-number-format:General;
+            text-align:center;
+            vertical-align:middle;
+            white-space:nowrap;
+            background:auto;
+            mso-pattern:auto;
+            color:#000000;
+            font-size:11pt;
+            font-weight:400;
+            font-style:normal;
+            font-family:"等线","sans-serif";
+            border-top:1px solid #000000;
+            border-right:1px solid #000000;
+            border-bottom:1px solid #000000;
+            border-left:1px solid #000000;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -711,67 +847,65 @@
 </head>
 <body link=blue vlink=purple >
 
-<table border=0 cellpadding=0 cellspacing=0 width=1024 style='border-collapse:
- collapse;table-layout:fixed;width:768pt;margin: 0 auto;' id="app">
-    <col width=118 style='mso-width-source:userset;width:171pt'>
-    <col width=151 style='mso-width-source:userset;width:113.25pt'>
+<table border=0 cellpadding=0 cellspacing=0 width=1173 style='border-collapse:
+ collapse;table-layout:fixed;width:879pt;margin: auto'>
+    <col width=220 style='mso-width-source:userset;width:165pt'>
+    <col width=197 style='mso-width-source:userset;width:147.75pt'>
     <col width=113 style='mso-width-source:userset;width:84.75pt'>
-    <col width=151 style='mso-width-source:userset;width:113.25pt'>
+    <col width=152 style='mso-width-source:userset;width:114pt'>
     <col width=141 style='mso-width-source:userset;width:105.75pt'>
-    <col width=131 style='mso-width-source:userset;width:157.25pt'>
+    <col width=131 style='mso-width-source:userset;width:98.25pt'>
     <col width=219 style='mso-width-source:userset;width:164.25pt'>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r0'>
-        <td colspan=7 height=53 class=x24 width=1024 style='border:none;height:40pt;'>[[${sysuser.dept.deptName}]]密品统计信息表</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r0'>
+        <td colspan=7 height=55 class=x35 width=1173 style='height:41.25pt;'>[[${sysuser.dept.deptName}]]密品统计信息表</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r1'>
-        <td colspan=2 height=53 class=x27 style='border-bottom:1px solid windowtext;border-top:none;border-left:none;height:40pt;'>单位：[[${sysuser.dept.deptName}]]</td>
-        <td class=x29 style="border-top: none;"></td>
-        <td class=x30 style="border-top: none;"></td>
-        <td class=x30 style="border-top: none;"></td>
-        <td class=x31 style="border-top: none;"><span style='float:right' id="dqdate">日期：</span></td>
-        <td class=x32 style="border-top: none;"></td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r1'>
+        <td colspan=2 height=54 class=x36 style='border-bottom:1px solid #000000;height:40.5pt;'>单位：[[${sysuser.dept.deptName}]]</td>
+        <td class=x22></td>
+        <td class=x23></td>
+        <td class=x23></td>
+        <td class=x24><span style='float:right' id="dqdate">日期：</span></td>
+        <td class=x21></td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r2'>
-        <td height=53 class=x21 style='height:40pt;'>所属市州</td>
-        <td class='x21 part'></td>
-        <td class=x21>所属区县</td>
-        <td colspan=2 class='x22 area' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'></td>
-        <td class=x21>登记人员</td>
-        <td class=x21>[[${tdPropertyManager.recoverName}]]</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r2'>
+        <td height=53 class=x25 style='height:39.75pt;'>所属市州</td>
+        <td class='x26 part' style="text-align: center"></td>
+        <td class='x25'>所属区县</td>
+        <td colspan=2 class='x37 area' style='text-align:center;border-right:1px solid #000000;border-bottom:1px solid #000000;'></td>
+        <td class=x25>登记人员</td>
+        <td class=x30>[[${tdPropertyManager.recoverName}]]</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r3'>
-        <td height=53 class=x21 style='height:40pt;'>使用部门</td>
-        <td class=x21>[[${tdPropertyManager.useDepart}]]</td>
-        <td class=x21>使用人员</td>
-        <td colspan=2 class=x22 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdPropertyManager.userName}]]</td>
-        <td class=x21>登记时间</td>
-        <td class=x21 id="recoverDate">[[${tdPropertyManager.recoverDate}]]</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r3'>
+        <td height=53 class=x25 style='height:39.75pt;'>使用部门</td>
+        <td class=x25 style='white-space: normal;'>[[${tdPropertyManager.useDepart}]]</td>
+        <td class=x25>使用人员</td>
+        <td colspan=2 class=x38 style='border-right:1px solid #000000;border-bottom:1px solid #000000;'>[[${tdPropertyManager.userName}]]</td>
+        <td class=x25>登记时间</td>
+        <td class=x30 id="recoverDate">[[${tdPropertyManager.recoverDate}]]</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r4'>
-        <td height=53 class=x21 style='height:40pt;'>接收时间</td>
-        <td class=x21 id="useDate">[[${tdPropertyManager.useDate}]]</td>
-        <td class=x21>登记编号</td>
-        <td colspan=2 class=x22 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdPropertyManager.useId}]]</td>
-        <td class=x21>密品总数</td>
-        <td class=x21>[[${tdPropertyManager.propertyNum}]]</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r4'>
+        <td height=53 class=x25 style='height:39.75pt;'>接收时间</td>
+        <td class=x25 style='overflow:hidden;' id="useDate">[[${tdPropertyManager.useDate}]]</td>
+        <td class=x25>登记编号</td>
+        <td colspan=2 class=x38 style='border-right:1px solid #000000;border-bottom:1px solid #000000;'>[[${tdPropertyManager.useId}]]</td>
+        <td class=x25>密品总数</td>
+        <td class=x30>[[${tdPropertyManager.propertyNum}]]</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt;font-weight: bold' id='r5'>
-        <td height=53 class=x21 style='height:40pt;font-weight: bold'>密品编号</td>
-        <td class=x21 style="font-weight: bold">密品名称</td>
-        <td class=x21 style="font-weight: bold">品牌</td>
-        <td class=x21 style="font-weight: bold">型号</td>
-        <td class=x21 style="font-weight: bold">密品SN码</td>
-        <td class=x21 style="font-weight: bold">密品种类</td>
-        <td class=x21 style="font-weight: bold">备注信息</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r5'>
+        <td height=53 class=x27 style='height:39.75pt;'>密品编号</td>
+        <td colspan=2 class=x31 style='border-right:1px solid #000000;border-bottom:1px solid #000000;'>品牌</td>
+        <td class=x27>型号</td>
+        <td class=x27>密品SN码</td>
+        <td class=x27>密品种类</td>
+        <td class=x27>备注信息</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r6' th:each="propertynum : ${tdPropertyInfos}">
-        <td height=53 class=x21 style='height:40pt;'>[[${propertynum.id}]]</td>
-        <td class=x21>[[${propertynum.propertyName}]]</td>
-        <td class=x21>[[${propertynum.propertyBrand}]]</td>
-        <td class=x21>[[${propertynum.propertyNo}]]</td>
-        <td class=x21>[[${propertynum.propertySn}]]</td>
-        <td class='x21 propertyType'>[[${propertynum.propertyType}]]</td>
-        <td class=x21>[[${propertynum.remark}]]</td>
+    <tr height=55 style='mso-height-source:userset;height:41.25pt' id='r6' th:each="propertynum : ${tdPropertyInfos}">
+        <td height=53 class=x25 style='height:39.75pt;'>[[${propertynum.id}]]</td>
+        <td colspan=2 class=x33 style='border-right:1px solid #000000;border-bottom:1px solid #000000;'>[[${propertynum.propertyBrand}]]</td>
+        <td class=x25 style='overflow:hidden;'>[[${propertynum.propertyNo}]]</td>
+        <td class=x25 style='overflow:hidden;'>[[${propertynum.propertySn}]]</td>
+        <td class='x29 propertyType' style='overflow:hidden;text-align: center'>[[${propertynum.propertyType}]]</td>
+        <td class=x25>[[${propertynum.remark}]]</td>
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
@@ -779,7 +913,6 @@
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
-    <![endif]>
 </table>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
