From bd50d13b9a0769930f0c63dcc8226a5518405320 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: Tue, 30 Jul 2024 09:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E7=9A=84=E4=BA=A4=E7=8F=AD=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/DataService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f656fc5..36dc67a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
@@ -111,7 +111,7 @@ public class DataService {
 
         HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
                 ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null,
-                ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):"",
+                DateUtils.getTime(new Date()),
                 ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
                 list,memberData,shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount())?BigDecimal.ZERO:shopUserDuty.getQuickAmount()).toPlainString(),
                 "0",