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/request/wallet/QueryWalletDTO.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
index b6ec5b2..9dd1bb0 100644
--- a/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java
@@ -1,7 +1,11 @@
package com.mzl.flower.dto.request.wallet;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
@Data
public class QueryWalletDTO {
@@ -9,7 +13,30 @@
@ApiModelProperty(value = "供应商Id")
private String supplierId;
- @ApiModelProperty(value = "用户Id")
- private String userId;
+ @ApiModelProperty(value = "供应商名称")
+ private String supplierName;
+
+ @ApiModelProperty(value = "提交日期-开始日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate createStartDate;
+
+ @ApiModelProperty(value = "提交日期-结束日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endEndDate;
+
+ @ApiModelProperty(value = "审核时间-开始日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private LocalDate approveStartDate;
+
+ @ApiModelProperty(value = "审核时间-结束日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private LocalDate approveEndDate;
+
+ @ApiModelProperty(value = "提现状态")
+ private String withdrawState;
}
--
Gitblit v1.9.3