From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
index da4c39e..91ef39a 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
@@ -29,10 +29,11 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ private String idStr;
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -46,6 +47,14 @@
@ApiModelProperty(value = "提现金额")
@TableField("withdrawal_amount")
private BigDecimal withdrawalAmount;
+
+ @ApiModelProperty(value = "到账金额")
+ @TableField("arrival_amount")
+ private BigDecimal arrivalAmount;
+
+ @ApiModelProperty(value = "手续费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
@ApiModelProperty(value = "1微信2银行卡")
@TableField("withdrawal_method")
@@ -62,6 +71,14 @@
@ApiModelProperty(value = "审核状态 1'待审核',2'审核通过',3'审核拒绝' ")
@TableField("audit_status")
private Integer auditStatus;
+
+ @ApiModelProperty(value = "状态（1=处理中，2=成功）")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "到账时间")
+ @TableField("arrival_time")
+ private LocalDateTime arrivalTime;
@TableField(exist = false)
private String userName;
@TableField(exist = false)
--
Gitblit v1.7.1