From 200acf9283ff06e75874df263b1e125a71e76215 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 14:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
index 4e8d7ca6..1e68f6a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java
@@ -166,6 +166,9 @@
@TableField("cardType")
private Integer cardType;
+ @TableField("status")
+ private Integer status;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1