From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 0a663d1..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
@@ -31,10 +31,10 @@
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.NONE)
     private Long id;
     /**
-     * 优惠券id
+     * 商品id
      */
     @TableField("pointsMerchandiseId")
     private Integer pointsMerchandiseId;
@@ -83,6 +83,21 @@
      */
     @TableField("orderNumber")
     private String orderNumber;
+    /**
+     * 现金的支付状态
+     */
+    @TableField("payStatus")
+    private Integer payStatus;
+    /**
+     * 可使用的门店id
+     */
+    @TableField("storeId")
+    private Integer storeId;
+    /**
+     * 1=正常 2=删除
+     */
+    @TableField("state")
+    private Integer state;
 
 
     @Override

--
Gitblit v1.7.1