From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..6b30671 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,8 +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() {
--
Gitblit v1.7.1