From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-web/src/main/resources/templates/print/pay.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/print/pay.html b/fzzy-igdss-web/src/main/resources/templates/print/pay.html
index 57a38a5..15333bf 100644
--- a/fzzy-igdss-web/src/main/resources/templates/print/pay.html
+++ b/fzzy-igdss-web/src/main/resources/templates/print/pay.html
@@ -2,7 +2,7 @@
 <html lang='zh-cn'>
 
 <head>
-    <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+    <meta content='text/html;charset=UTF-8' http-equiv='Content-Type'>
     <title>缁撶畻鍗�</title>
     <style>
         body {text-align: center;padding: 10px;font-family: '瀹嬩綋';}  .tit {font-size: 24px;flex-grow: 1;text-align: center;}  .div-tit {padding-top: 6px;}  table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px;border-collapse: collapse;}  table td {border-left: 1px solid;border-top: 1px solid;height: 32px;}  .sp1 {width: 33%;float: left;padding-bottom: 5px;}  .sp2 {width: 25%;float: left;text-align: center;}  .sp3 {width: 16.6%;float: left;text-align: center;}  .txt-left {text-align: left;}  .txt-center {text-align: center;}  .txt-right {text-align: right;}
@@ -12,16 +12,16 @@
 <body>
 <h1 class='tit'><u>[billTitle]</u></h1>
 <div class='div-tit'><span class='sp1 txt-left'>搴撳尯鍚嶇О锛歔deptId]</span><span class='sp1 txt-center'>鍗曟嵁鍙�:[id]</span><span class='sp1 txt-right'>鎵撳嵃鏃堕棿锛歔payTime]</span></div>
-<table cellspacing='0' cellpadding='0'>
+<table cellpadding='0' cellspacing='0'>
     <tr>
         <td>瀹㈡埛鍚嶇О</td>
         <td colspan='7'>[customerName]</td>
     </tr>
     <tr>
         <td width='12.5%'>鎵胯繍浜�</td>
-        <td width='37.5%' colspan='3'>[userName]</td>
+        <td colspan='3' width='37.5%'>[userName]</td>
         <td width='12.5%'>鑱旂郴鐢佃瘽</td>
-        <td width='37.5%' colspan='3'>[userContact]</td>
+        <td colspan='3' width='37.5%'>[userContact]</td>
     </tr>
     <tr>
         <td>韬唤璇佸彿鐮�</td>

--
Gitblit v1.9.3