From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java | 120 ++---------------------------------------------------------
1 files changed, 5 insertions(+), 115 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
index b03b5f8..f15c11d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
import java.util.Date;
/**
* 用户红包记录
*/
+@Data
@TableName("t_user_red_packet_record")
public class UserRedPacketRecord {
/**
@@ -24,10 +26,10 @@
@TableField("money")
private Double money;
/**
- * 过期时间
+ * 剩余金额
*/
- @TableField("expirationTime")
- private Date expirationTime;
+ @TableField("remainingAmount")
+ private Double remainingAmount;
/**
* 添加时间
*/
@@ -70,117 +72,5 @@
@TableField("redPacketActivityId")
private Integer redPacketActivityId;
- private Double distance;
- public Double getDistance() {
- return distance;
- }
-
- public void setDistance(Double distance) {
- this.distance = distance;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Integer orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getRedPacketActivityId() {
- return redPacketActivityId;
- }
-
- public void setRedPacketActivityId(Integer redPacketActivityId) {
- this.redPacketActivityId = redPacketActivityId;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- @Override
- public String toString() {
- return "UserRedPacketRecord{" +
- "id=" + id +
- ", money=" + money +
- ", expirationTime=" + expirationTime +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", state=" + state +
- ", orderId=" + orderId +
- ", orderType=" + orderType +
- ", userId=" + userId +
- ", redPacketActivityId=" + redPacketActivityId +
- '}';
- }
}
--
Gitblit v1.7.1