From cb9461dfc4dc98992de54bc83d1dea45e93a65c8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 11:07:02 +0800
Subject: [PATCH] 修改配置

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java |   56 +++++++++++++++++++-------------------------------------
 1 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
index 33cc31b..eb538e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
@@ -1,11 +1,14 @@
 package com.ruoyi.system.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,45 +20,46 @@
  * </p>
  *
  * @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_tenant")
 @ApiModel(value="TTenant对象", description="租户")
-public class TTenant implements Serializable {
+public class TTenant extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "住户名称")
-    @TableField("residentName")
+    @TableField("resident_name")
     private String residentName;
 
     @ApiModelProperty(value = "入住时间")
-    @TableField("checkInTime")
-    private LocalDateTime checkInTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("checkIn_time")
+    private LocalDateTime checkinTime;
 
     @ApiModelProperty(value = "租户属性")
-    @TableField("tenantAttributes")
+    @TableField("tenant_attributes")
     private String tenantAttributes;
 
     @ApiModelProperty(value = "租户类型")
-    @TableField("tenantType")
+    @TableField("tenant_type")
     private Integer tenantType;
 
     @ApiModelProperty(value = "租户楼栋")
-    @TableField("tenantBuilding")
+    @TableField("tenant_building")
     private String tenantBuilding;
 
     @ApiModelProperty(value = "房号")
-    @TableField("roomNumber")
+    @TableField("room_number")
     private String roomNumber;
 
     @ApiModelProperty(value = "建筑面积")
-    @TableField("buildingArea")
+    @TableField("building_area")
     private Integer buildingArea;
 
     @ApiModelProperty(value = "联系电话")
@@ -63,7 +67,7 @@
     private String phone;
 
     @ApiModelProperty(value = "证件号码")
-    @TableField("idCard")
+    @TableField("id_card")
     private String idCard;
 
     @ApiModelProperty(value = "邮箱")
@@ -71,33 +75,11 @@
     private String email;
 
     @ApiModelProperty(value = "银行转账专号")
-    @TableField("bankNumber")
+    @TableField("bank_number")
     private String bankNumber;
 
     @ApiModelProperty(value = "通讯地址")
-    @TableField("mailAddress")
+    @TableField("mail_address")
     private String mailAddress;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("createTime")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("updateTime")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人")
-    @TableField("createBy")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改人")
-    @TableField("updateBy")
-    private String updateBy;
-
-    @ApiModelProperty(value = "是否删除 0=否 1=是")
-    @TableField("isDelete")
-    @TableLogic
-    private Integer isDelete;
-
 
 }

--
Gitblit v1.7.1