From 738f93e8f8226518e5b0e202b1f7afd19c01656e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 25 七月 2023 09:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java b/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
index 05d3117..4fe3686 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
@@ -1,6 +1,7 @@
package com.dsh.account.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -31,43 +32,52 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 流水号
*/
+ @TableField("code")
private String code;
/**
* 用户id
*/
+ @TableField("appUserId")
private Integer appUserId;
/**
* 充值金额
*/
+ @TableField("amount")
private BigDecimal amount;
/**
* 玩湃币
*/
+ @TableField("playPaiCoins")
private Integer playPaiCoins;
/**
* 支付状态（1=待支付，2=已支付）
*/
+ @TableField("payStatus")
private Integer payStatus;
/**
* 支付时间
*/
+ @TableField("payTime")
private Date payTime;
/**
* 第三方支付流水号
*/
+ @TableField("orderNumber")
private String orderNumber;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
+ @TableField("state")
private Integer state;
/**
* 添加时间
*/
+ @TableField("insertTime")
private Date insertTime;
--
Gitblit v1.7.1