From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java | 14 +++++++++++---
1 files changed, 11 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 9580345..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
@@ -1,6 +1,7 @@
package com.ruoyi.admin.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -48,6 +49,9 @@
@TableField("site_id")
private Integer siteId;
+
+ @TableField("site_name")
+ private String siteName;
@TableField("is_pay")
private Integer is_pay;
@TableField("franchisee_name")
@@ -65,12 +69,15 @@
private String updateBy;
@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;
@@ -79,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)
@@ -88,4 +95,5 @@
private List<Site> franchiseName;
+
}
--
Gitblit v1.7.1