From 8e524f6e570fca66f670a8072edefc6ca2d4e2f9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 08:55:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java | 5 +++++
1 files changed, 5 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 fe72114..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
@@ -163,6 +163,11 @@
*/
@TableField("shelves")
private Integer shelves;
+ @TableField("cardType")
+ private Integer cardType;
+
+ @TableField("status")
+ private Integer status;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1