From d2f5964f2286f45a3dd9a8b05d325b29d9a0a8ab Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 25 一月 2024 14:30:10 +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 | 14 +++++++++----- 1 files changed, 9 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..f1df434 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,11 @@ public class VoGeneral implements BaseEntity { private static final long serialVersionUID = 202401241706001L; + @Schema(title = "鎬昏处ID") + private Long generalId; + @Schema(title = "鏀堕摱鍛樺鍚�") - private String clientNum; + private String cashierName; @Schema(title = "瀹炴敹閲戦") private Float tradeAmount; @@ -30,7 +31,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