From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +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 | 19 +++++++++++++++++++
1 files changed, 19 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..d3a7d17 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,19 +6,27 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class WalletBillRecordVO extends AbstractTransDTO {
+ private String id;
@ApiModelProperty(value = "供应商Id")
private Long supplierId;
+ @ApiModelProperty(value = "供应商名称")
+ private String supplierName;
@ApiModelProperty(value = "钱包Id")
private Long walletId;
@ApiModelProperty(value = "账单变动类型（提现,结算）")
@DictTrans(target = "typeName",codeType = "BILL_CHANGE_TYPE")
private String type;
+
+ @ApiModelProperty(value = "账单提现类型")
+ @DictTrans(target = "withdrawTypeName",codeType = "BILL_WITHDRAW_TYPE")
+ private String withdrawType;
@ApiModelProperty(value = "类型明细")
private String typeDetail;
@@ -42,6 +50,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;
@@ -57,4 +73,7 @@
@ApiModelProperty(value = "变动方式（增加、减少")
private String methodName;
+ @ApiModelProperty(value = "账单提现类型名称（发起提现、提现失败、提现成功）")
+ private String withdrawTypeName;
+
}
--
Gitblit v1.9.3