From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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..4fa8b3b 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,6 +163,12 @@
*/
@TableField("shelves")
private Integer shelves;
+ @TableField("cardType")
+ private Integer cardType;
+ @TableField("status")
+ private Integer status;
+ @TableField("remark")
+ private String remark;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1