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/entity/wallet/WalletBillRecordDO.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
index ce78d98..684439d 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -2,9 +2,7 @@
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,6 +28,9 @@
@ApiModelProperty(value = "账单变动类型（提现,结算）")
private String type;
+ @ApiModelProperty(value = "账单变动提现类型")
+ private String withdrawType;
+
@ApiModelProperty(value = "类型明细")
private String typeDetail;
@@ -54,7 +55,28 @@
@ApiModelProperty(value = "转账明细id")
private String transferDetailId;
+ @ApiModelProperty(value = "转账状态")
+ private String transferState;
+
@ApiModelProperty(value = "openId")
private String openId;
+ @ApiModelProperty(value = "提现记录表ID")
+ private Long withdrawRecordId;
+
+ @ApiModelProperty(value = "orderNo")
+ private String orderNo;
+
+ @ApiModelProperty(value = "orderItemId")
+ private String orderItemId;
+
+ @ApiModelProperty(value = "结算金额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "实际转账金额")
+ private BigDecimal actualTransferAmount;
+
}
--
Gitblit v1.9.3