From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
index ee2d458..42c4b3b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
@@ -66,8 +66,8 @@
/**
* 审核状态
*/
- @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
- private Integer approveState;
+ @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
+ private String approveState;
/**
* 不通过原因
--
Gitblit v1.9.3