From 4b25a348feacbc6eb1b07fe2a107e3a94c6d9c4e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 15:35:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 67536bb..97a1805 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
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +39,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "用户id")
@@ -47,6 +49,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")
@@ -63,6 +73,18 @@
@ApiModelProperty(value = "审核状态 1'待审核',2'审核通过',3'审核拒绝' ")
@TableField("audit_status")
private Integer auditStatus;
+
+ @ApiModelProperty(value = "状态（1=处理中，2=成功，3=失败）")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "处理结果")
+ @TableField("remark")
+ private String remark;
+
+ @ApiModelProperty(value = "到账时间")
+ @TableField("arrival_time")
+ private LocalDateTime arrivalTime;
@TableField(exist = false)
private String userName;
@TableField(exist = false)
--
Gitblit v1.7.1