From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html b/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html
index 22c1c0a..b760539 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html
@@ -32,7 +32,7 @@
<h1 style="text-align: center;font-size: 18px;margin: 20px auto;">
{{order.shopName}}
</h1>
- <table style="width: 100%; font-size:12px;line-height: 20px;">
+ <table style="width: 100%; font-size:12px;">
<tr>
<td colspan="2">
@@ -56,7 +56,7 @@
</tr>
</table>
<p>--------------------------------</p>
- <table style="width: 80%;font-size:12px;margin-top: 20px;text-align: left">
+ <table style="width: 80%;font-size:12px;margin-top: 10px;text-align: left; margin-bottom: 5px;">
<tr>
<th style="text-align: left;" colspan="4">产品</th>
@@ -89,7 +89,7 @@
</tr>
</table>
<p>--------------------------------</p>
- <table style="width: 100%;font-size: 10px;line-height: 30px;">
+ <table style="width: 100%;font-size: 10px; margin-bottom: 5px;">
<tr >
<td>
<b >储值卡余额:</b><span >{{totalMoney}}</span>
--
Gitblit v1.9.1