Merge branch 'feature/ooxml_encryption' into 'wrdp'

公文编辑器，模板“函”调整红线

See merge request o2oa/o2oa!4909

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html

@@ -145,12 +145,17 @@ AAAAAAAAAAAAAAAnBAAAZHJzL2Rvd25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAC4FAAAAAA==
     <div style='mso-ignore:vglayout;'>
         <img width=649 height=6
              src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_line.png"
-             style="width:100%">
-    </div>
-
-    <div class="doc_block">
-        <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋;line-height: 22pt'><span>&nbsp</span></P>
+             style="width:100%; line-height: 5pt">
     </div>
+    <table class="doc_block doc_layout_edition" data-compute-style="y" border=0 cellspacing=0 cellpadding=0
+           style='position:absolute; bottom:0; width:442.2pt; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;'>
+        <tr>
+            <td style="width: 442.2pt">
+                <img src="../x_component_process_FormDesigner/Module/Documenteditor/templete/meeting_bottom_line.png"
+                     style="width:100%; line-height: 5pt">
+            </td>
+        </tr>
+    </table>
 
     <table class="doc_block" border=0 cellspacing=0 cellpadding=0
            style='border-collapse:collapse;border:none;mso-padding-alt: 0cm 0cm 0cm 0cm;'>