Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back into feature-check

dev-union/src/main/resources/htmlTemplate/bill11.html

@@ -356,7 +356,7 @@
                             </span>
                         </div>
                     </p>
-                    <div style="height: 530px;overflow:hidden">
+                    <div style="height: 530px;">
                         <table class="altrowstable" id="alternatecolor">
                             <tr>
                                 <th width="190px">型号</th>