From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
index 96daacd..e347deb 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
@@ -22,7 +22,7 @@
*/
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
private Integer pointsMerchandiseId;
/**
@@ -69,7 +69,10 @@
* 可使用的门店id
*/
private Integer storeId;
-
+ /**
+ * 1=正常 2= 删除
+ */
+ private Integer state;
}
--
Gitblit v1.7.1