From b4aa242d1b818a8ad3a285166caedb699bbcb460 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java | 9 +++++----
1 files changed, 5 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..e864d05 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -2,6 +2,7 @@
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;
@@ -16,7 +17,7 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet_bill_record")
-public class WalletBillRecordDO extends BaseEntity {
+public class WalletBillRecordDO extends BaseAutoEntity {
@ApiModelProperty(value = "供应商Id")
@@ -26,16 +27,16 @@
private Long walletId;
@ApiModelProperty(value = "账单变动类型（提现,结算）")
- private Integer type;
+ private String type;
@ApiModelProperty(value = "类型明细")
- private Integer typeDetail;
+ private String typeDetail;
@ApiModelProperty(value = "转账Id")
private String transferId;
@ApiModelProperty(value = "变动方式（增加、减少")
- private Integer method;
+ private String method;
@ApiModelProperty(value = "原金额")
private BigDecimal originalAmount;
--
Gitblit v1.9.3