From 9b185b07f035fa8f1b26c19a8eab4784413d4d96 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 31 七月 2023 14:48:52 +0800
Subject: [PATCH] app端：使用福利的账单接口bug；管理后台新增优惠券审核页面
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 8 ++++++--
1 files changed, 6 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..37d14c1 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,7 +31,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 优惠券id
@@ -83,7 +83,11 @@
*/
@TableField("orderNumber")
private String orderNumber;
-
+ /**
+ * 现金的支付状态
+ */
+ @TableField("payStatus")
+ private Integer payStatus;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1