From e5ed9472ff4b5bf2f26e5beb6a77af571057b79b Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 01 十一月 2023 18:58:03 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- 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