From 58eb528047a6658cf5306d1f81ad4b2574c2de9e 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: Sat, 17 Aug 2024 18:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8D=95=E4=BB=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java     | 5 +++++
 .../cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
index d15646af..a9167784 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java
@@ -75,6 +75,11 @@ public class ViewConInfoFlow implements Serializable {
     private BigDecimal balance;
 
 
+    @Column(name = "`status`",nullable = false)
+    @ApiModelProperty(value = "status")
+    private String status;
+
+
 
     @Column(name = "`product_id`")
     @ApiModelProperty(value = "商品id")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
index 3b35c877..6e5e19ed 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java
@@ -50,7 +50,7 @@ public class ViewConInfoFlowDto implements Serializable {
     private String productId;
 
     private String productName;
-
+    private String status;
 
     private String conCode;