From e0786b57f356db59efc6a4a3dd5e23908775286a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
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