From 6f0cee21409ccd21a762fb3a3a46cec06f65b503 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 14:31:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java b/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
index 7d19754..64f50e1 100644
--- a/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java
@@ -31,7 +31,7 @@
private String withdrawTypeStr;
@ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
- @DictTrans(target = "withdrawStateStr", codeType = "WALLET_WITHDRAW_STATE")
+ @DictTrans(target = "withdrawStateStr", codeType = "BILL_WITHDRAW_TYPE")
private String withdrawState;
private String withdrawStateStr;
@@ -68,4 +68,7 @@
@ApiModelProperty("更新人")
private String updateBy;
+
+ @ApiModelProperty(value = "审核人")
+ private String approveName;
}
--
Gitblit v1.9.3