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/entity/wallet/WalletBillRecordDO.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 e864d05..0d87f09 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -1,8 +1,8 @@
package com.mzl.flower.entity.wallet;
import java.math.BigDecimal;
+
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;
@@ -17,8 +17,7 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet_bill_record")
-public class WalletBillRecordDO extends BaseAutoEntity {
-
+public class WalletBillRecordDO extends BaseEntity {
@ApiModelProperty(value = "供应商Id")
private Long supplierId;
@@ -31,6 +30,9 @@
@ApiModelProperty(value = "类型明细")
private String typeDetail;
+
+ @ApiModelProperty(value = "结算单id")
+ private String settlementId;
@ApiModelProperty(value = "转账Id")
private String transferId;
@@ -47,5 +49,28 @@
@ApiModelProperty(value = "余额")
private BigDecimal balance;
+ @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;
}
--
Gitblit v1.9.3