From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
index 20944de..93c2947 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -15,19 +16,19 @@
@Data
@ApiModel(description = "加盟商提现记录表")
+@TableName("t_franchisee_withdraw")
public class FranchiseeWithdraw extends BaseEntity {
@ApiModelProperty(value = "主键ID")
@TableId(value = "id", type = IdType.AUTO)
-
private Integer id;
@ApiModelProperty(value = "加盟商余额明细记录id")
- @TableField("changeId")
+ @TableField("change_id")
private Integer changeId;
@ApiModelProperty(value = "加盟商id")
- @TableField("franchiseeId")
+ @TableField("franchisee_id")
private Integer franchiseeId;
@ApiModelProperty(value = "状态1待审核 2已通过 3已驳回")
@TableField("status")
--
Gitblit v1.7.1