From 0eae7dd467ce8e3894d8e63b88eab8248f216628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Fri, 26 Jul 2024 13:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=91=98=E5=B7=A5=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/DataService.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
index b49c222..a0853e3 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
@@ -222,7 +222,7 @@ public class DataService {
                     HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(),
                             ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null,
                             DateUtils.getTime(new Date()),
-                            ObjectUtil.isNull(shopStaff)?"":shopStaff.getAccount(),
+                            ObjectUtil.isNull(shopStaff)?"":shopStaff.getName(),
                             list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(),
                             "0",
                             shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(),
@@ -238,7 +238,7 @@ public class DataService {
 
                     if(ObjectUtil.isNotNull(shopStaff)){
                         tbHandover.setStaffId(shopStaff.getId());
-                        tbHandover.setStaffName(shopStaff.getAccount());
+                        tbHandover.setStaffName(shopStaff.getName());
                     }
                     tbHandover.setTradeDay(DateUtils.getDays());
                     tbHandover.setPrintNo(it.getAddress());