From 3948f4fc637d8439bc2a2e44c449e968b3c0fb15 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 一月 2024 08:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..b9fd28b 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;
@@ -30,7 +34,10 @@
@Schema(title = "鎬婚")
private Float totalAmount;
- @Schema(title = "鏃ユ湡")
- private Date operateDate;
+ @Schema(title = "浜ゆ槗鏃ユ湡")
+ private String operateDate;
+
+ @Schema(title = "瀹℃牳鐘舵��")
+ private String auditStatus;
}
--
Gitblit v1.8.0