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/FranchiseeWithdraw.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 0898ad5..da6c572 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
@@ -1,7 +1,11 @@
package com.ruoyi.admin.entity;
+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;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,47 +16,43 @@
@Data
@ApiModel(description = "加盟商提现记录表")
-public class FranchiseeWithdraw {
+@TableName("t_franchisee_withdraw")
+public class FranchiseeWithdraw extends BaseEntity {
@ApiModelProperty(value = "主键ID")
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
@ApiModelProperty(value = "加盟商余额明细记录id")
+ @TableField("change_id")
private Integer changeId;
@ApiModelProperty(value = "加盟商id")
+ @TableField("franchisee_id")
private Integer franchiseeId;
-
@ApiModelProperty(value = "状态1待审核 2已通过 3已驳回")
+ @TableField("status")
private Integer status;
-
@ApiModelProperty(value = "申请原因")
+ @TableField("content")
private String content;
-
@ApiModelProperty(value = "金额")
+ @TableField("money")
private BigDecimal money;
-
@ApiModelProperty(value = "结果说明")
+ @TableField("result")
private String result;
-
@ApiModelProperty(value = "凭证")
+ @TableField("img")
private String img;
-
- @ApiModelProperty(value = "创建人")
- private String createBy;
-
@ApiModelProperty(value = "操作人")
- private String updateBy;
+ @TableField("handle")
+ private String handle;
+ @ApiModelProperty(value = "加盟商名称")
+ @TableField(exist = false)
+ private String franchiseeName;
+ @ApiModelProperty(value = "加盟商手机号")
+ @TableField(exist = false)
+ private String franchiseePhone;
-
- @TableField("createTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "创建时间")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
- @ApiModelProperty(value = "是否删除 0未删除;1已删除")
- private Integer isDelete;
}
--
Gitblit v1.7.1