From 1a3801b7316b0a23b6d3924eb4fbb023b1edef83 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 10:30:14 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
index a636b6d..57341a7 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
@@ -163,9 +163,18 @@
      */
     @TableField("shelves")
     private Integer shelves;
-    @TableField("cardTye")
-    private Integer cardTye;
-
+    @TableField("cardType")
+    private Integer cardType;
+    @TableField("status")
+    private Integer status;
+    @TableField("remark")
+    private String remark;
+    // 已领数量
+    @TableField(exist = false)
+    private Integer pickUpQuantity3;
+    // 已兑换数量
+    @TableField(exist = false)
+    private Integer pickUpQuantity4;
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1