From 41b60f3df5f3054aad44307c13a26b14f3b32ac0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 09:46:03 +0800
Subject: [PATCH] 11.21

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 017a237..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,7 +163,18 @@
      */
     @TableField("shelves")
     private Integer shelves;
-
+    @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