From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java b/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
index 51af78a..5ed86d7 100644
--- a/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
@@ -6,13 +6,17 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class WalletBillRecordVO extends AbstractTransDTO {
+    private Long id;
 
     @ApiModelProperty(value = "供应商Id")
     private Long supplierId;
 
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
     @ApiModelProperty(value = "钱包Id")
     private Long walletId;
 
@@ -42,6 +46,14 @@
     @ApiModelProperty(value = "余额")
     private BigDecimal balance;
 
+    @ApiModelProperty("提交时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "审核时间")
+    private LocalDateTime approveTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
     @ApiModelProperty(value = "转账明细id")
     private String transferDetailId;
 

--
Gitblit v1.9.3