From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java
index d98162b..6983b54 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java
@@ -71,12 +71,13 @@
@TableField("createTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
-
+ @TableField(exist = false)
+ private String createTimeStr;
@TableField("updateTime")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "1扣款2充值")
+ @ApiModelProperty(value = "1扣款2充值3余额提现4余额提现回退")
@TableField("type")
private Integer type;
@@ -85,7 +86,7 @@
@TableLogic
private Integer isDelete;
@TableField(exist = false)
- private String payStr = "微信支付";
+ private String payStr;
@TableField(exist = false)
private List<Region> list;
@TableField(exist = false)
--
Gitblit v1.7.1