From 71745dc96e34135c4fee59a2a971eb1180b2a432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 15 Oct 2024 10:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/util/FeieyunPrintUtil.java        | 6 +++---
 .../system/cashierservice/util/PrinterUtils.java            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
index d637029..25a6d66 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
@@ -118,13 +118,13 @@ public class FeieyunPrintUtil {
 
         builder.append("<CB>" + pickupNumber + "</CB><BR><BR>");
         builder.append("<L>时间: " + date + " </L><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if (productName.length() > 4 || remark.length() > 4) {
             builder.append("<B><BOLD>" + productName + "      x " + number + "</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>" + StrUtil.emptyToDefault(remark,"") + " </BOLD></B><BR>");
+            builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
         } else {
             builder.append("<B><BOLD>" + productName + "      x " + number + "</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>" + StrUtil.emptyToDefault(remark,"") + " </BOLD></B><BR>");
+            builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
         }
 
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 2654e3e..118a2e0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -85,7 +85,7 @@ public class PrinterUtils {
             builder.append("<C><B>").append(pickupNumber).append("</B></C><BR><BR>");
         }
         builder.append("<S><L>时间: ").append(date).append(" </L></S><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if (productName.length() > 4 || remark.length() > 4) {
             builder.append("<CS:32>").append(productName).append("  ").append(number).append("</CS><BR>");
             if (StrUtil.isNotBlank(remark)) {