From 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 26 十二月 2024 17:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java
index 0116ae1..d3c6ee7 100644
--- a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java
@@ -11,7 +11,7 @@
public class QueryWalletWithdrawDTO {
@ApiModelProperty(value = "供应商Id")
- private Long supplierId;
+ private String supplierId;
@ApiModelProperty(value = "供应商名称")
private String supplierName;
@@ -36,7 +36,10 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
private LocalDate approveEndDate;
- @ApiModelProperty(value = "提现状态")
+ @ApiModelProperty(value = "审核状态")
private String approveState;
+ @ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
+ private String withdrawState;
+
}
--
Gitblit v1.9.3