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/dto/response/wallet/WalletWithdrawRecordVO.java |    2 +-
 1 files changed, 1 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 a6b9503..f5114db 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
@@ -36,7 +36,7 @@
     private LocalDateTime approveTime;
 
     @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
-    private Integer approveState;
+    private String approveState;
 
     @ApiModelProperty(value = "不通过原因")
     private String rejectReason;

--
Gitblit v1.9.3