From a60332d51fec0ae9f1afecc8c7a018c77e4ac101 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 27 二月 2024 10:03:29 +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 | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 a144e18..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
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.util.Date;
-
/**
* @author ZhuBaoMin
* @date 2024-01-24 17:00
@@ -18,8 +16,14 @@
public class VoGeneral implements BaseEntity {
private static final long serialVersionUID = 202401241706001L;
+ @Schema(title = "鎬昏处ID")
+ private String generalId;
+
+ @Schema(title = "鏀堕摱鍛業D")
+ private String cashierId;
+
@Schema(title = "鏀堕摱鍛樺鍚�")
- private String clientNum;
+ private String cashierName;
@Schema(title = "瀹炴敹閲戦")
private Float tradeAmount;
@@ -27,10 +31,13 @@
@Schema(title = "璧犻�侀噾棰�")
private Float gift;
- @Schema(title = "鎬婚")
- private Float totalAmount;
+ @Schema(title = "杩旇繕閲戦")
+ private Float refundAmount;
- @Schema(title = "鏃ユ湡")
- private Date operateDate;
+ @Schema(title = "浜ゆ槗鏃ユ湡")
+ private String operateDate;
+
+ @Schema(title = "瀹℃牳鐘舵��")
+ private String auditStatus;
}
--
Gitblit v1.8.0