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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 e301199..42c4b3b 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
@@ -25,7 +25,7 @@
* 供应商ID
*/
@ApiModelProperty(value = "供应商Id")
- private String supplierId;
+ private Long supplierId;
/**
* 提现金额
@@ -43,7 +43,7 @@
* 提现状态
*/
@ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
- private Integer withdrawState;
+ private String withdrawState;
/**
* 提现方式
@@ -66,8 +66,8 @@
/**
* 审核状态
*/
- @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
- private Integer approveState;
+ @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
+ private String approveState;
/**
* 不通过原因
--
Gitblit v1.9.3