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/UserPointsMerchandise.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
index 37d14c1..1399bb6 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
@@ -34,7 +34,7 @@
@TableId(value = "id", type = IdType.NONE)
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
@TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
@@ -88,6 +88,17 @@
*/
@TableField("payStatus")
private Integer payStatus;
+ /**
+ * 可使用的门店id
+ */
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ * 1=正常 2=删除
+ */
+ @TableField("state")
+ private Integer state;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1