From 7042adfac9eb4fcdb6cae5c9471727cdaeb358b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 09:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 1478c3d..41c9bdc 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
@@ -1,7 +1,12 @@
package com.dsh.account.feignclient.activity.model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -15,60 +20,81 @@
@Data
public class UserPointsMerchandise{
+
private static final long serialVersionUID = 1L;
/**
* 主键
*/
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 商品id
*/
+ @TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
/**
* 用户id
*/
+ @TableField("userId")
private Integer userId;
/**
* 核销人员id
*/
+ @TableField("verificationUserId")
private Integer verificationUserId;
/**
* 核销门店id
*/
+ @TableField("verifiStoreId")
private Integer verifiStoreId;
/**
* 核销时间
*/
+ @TableField("verificationTime")
private Date verificationTime;
/**
* 状态（1=待核销，2=已核销）
*/
+ @TableField("status")
private Integer status;
/**
* 领取时间
*/
+ @TableField("insertTime")
private Date insertTime;
/**
* 现金支付方式(1=微信2支付宝)
*/
+ @TableField("payType")
private Integer payType;
/**
- * 现金支付的交易凭证
+ * code
*/
+ @TableField("code")
private String code;
/**
- * 现金支付的交易订单号
+ * orderNumber
*/
+ @TableField("orderNumber")
private String orderNumber;
/**
- * 现金的支付状态（1=待支付 2=已支付）
+ * 现金的支付状态
*/
+ @TableField("payStatus")
private Integer payStatus;
/**
* 可使用的门店id
*/
+ @TableField("storeId")
private Integer storeId;
+ /**
+ * 1=正常 2=删除
+ */
+ @TableField("state")
+ private Integer state;
+
+
--
Gitblit v1.7.1