From 4bd0c2c252df008b98d3e9c7dac708ff642c90d1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
index f1df434..522b01a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
@@ -17,7 +17,10 @@
     private static final long serialVersionUID = 202401241706001L;
 
     @Schema(title = "鎬昏处ID")
-    private Long generalId;
+    private String generalId;
+
+    @Schema(title = "鏀堕摱鍛業D")
+    private String cashierId;
 
     @Schema(title = "鏀堕摱鍛樺鍚�")
     private String cashierName;
@@ -28,8 +31,8 @@
     @Schema(title = "璧犻�侀噾棰�")
     private Float gift;
 
-    @Schema(title = "鎬婚")
-    private Float totalAmount;
+    @Schema(title = "杩旇繕閲戦")
+    private Float refundAmount;
 
     @Schema(title = "浜ゆ槗鏃ユ湡")
     private String operateDate;

--
Gitblit v1.8.0