[模版修改] zjm

dev-union/src/main/resources/bill2.html

@@ -180,7 +180,7 @@
                         <p class="title" style="margin-bottom:20px">
                             <div class="main-title">
                                 <span>
-                                    ${title}
+                                    ${title!}
                                 </span>
                             </div>
                         </p>
@@ -199,11 +199,11 @@
                                         <td>
                                             ${dev.code!}
                                         </td>
-                                        <td>${dev.model}</td>
-                                        <td>${dev.category}</td>
-                                        <td>${dev.securityClassification}</td>
-                                        <td>${dev.applicationField}</td>
-                                        <td>${dev.deviceSerialNumber}</td>
+                                        <td>${dev.model!}</td>
+                                        <td>${dev.category!}</td>
+                                        <td>${dev.securityClassification!}</td>
+                                        <td>${dev.applicationField!}</td>
+                                        <td>${dev.deviceSerialNumber!}</td>
                                     </tr>
                                 </#list>
                             </table>

dev-union/src/main/resources/bill3.html

@@ -307,12 +307,12 @@
                         <div class="title">
                             <div class="main-title">
                                 <span>
-                                    工作交接单2
+                                    工作交接单
                                 </span>
                             </div>
                             <div style="width:100%;text-align:left;font-size: 1px;margin-bottom:20px">
                                 <div style="text-align:left;display: inline-block; width: 49%" class="number">
-                                    <span class="number">时间：${time}</span>
+                                    <span class="number">时间：${time!}</span>
                                 </div>
                                 <!-- <div style="text-align:center;display: inline-block; width: 34%" class="number">
                                     <span></span>
@@ -341,14 +341,14 @@
                                             <td>
                                                 ${dev.code!}
                                             </td>
-                                            <td>${dev.model}</td>
-                                            <td>${dev.name}</td>
-                                            <td>${dev.inLibraryNum}</td>
-                                            <td>${dev.repairNum}</td>
-                                            <td>${dev.scrappedNum}</td>
-                                            <td>${dev.retiredNum}</td>
-                                            <td>${dev.otherNum}</td>
-                                            <td>${dev.seqs}</td>
+                                            <td>${dev.model!}</td>
+                                            <td>${dev.name!}</td>
+                                            <td>${dev.inLibraryNum!}</td>
+                                            <td>${dev.repairNum!}</td>
+                                            <td>${dev.scrappedNum!}</td>
+                                            <td>${dev.retiredNum!}</td>
+                                            <td>${dev.otherNum!}</td>
+                                            <td>${dev.seqs!}</td>
                                         </tr>
                                     </#list>
                                 </table>