From 0f148ab371926582eeb2774904af5de6dc9e5761 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 16:32:42 +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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 8da1872..ce78d98 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -1,7 +1,10 @@
package com.mzl.flower.entity.wallet;
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;
@@ -18,7 +21,6 @@
@TableName("t_wallet_bill_record")
public class WalletBillRecordDO extends BaseEntity {
-
@ApiModelProperty(value = "供应商Id")
private Long supplierId;
@@ -26,16 +28,19 @@
private Long walletId;
@ApiModelProperty(value = "账单变动类型（提现,结算）")
- private Integer type;
+ private String type;
@ApiModelProperty(value = "类型明细")
- private Integer typeDetail;
+ private String typeDetail;
+
+ @ApiModelProperty(value = "结算单id")
+ private String settlementId;
@ApiModelProperty(value = "转账Id")
private String transferId;
@ApiModelProperty(value = "变动方式（增加、减少")
- private Integer method;
+ private String method;
@ApiModelProperty(value = "原金额")
private BigDecimal originalAmount;
@@ -46,5 +51,10 @@
@ApiModelProperty(value = "余额")
private BigDecimal balance;
+ @ApiModelProperty(value = "转账明细id")
+ private String transferDetailId;
+
+ @ApiModelProperty(value = "openId")
+ private String openId;
}
--
Gitblit v1.9.3