From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 c0b8fb4..cca42c8 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
@@ -43,9 +45,9 @@
@ApiModelProperty(value = "入住时间")
@NotNull(message = "入住时间不能为空")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("checkIn_time")
- private LocalDateTime checkinTime;
+ private LocalDate checkinTime;
@ApiModelProperty(value = "租户属性")
@TableField("tenant_attributes")
@@ -53,19 +55,7 @@
@ApiModelProperty(value = "租户类型")
@TableField("tenant_type")
- private Integer tenantType;
-
- @ApiModelProperty(value = "租户楼栋")
- @TableField("tenant_building")
- private String tenantBuilding;
-
- @ApiModelProperty(value = "房号")
- @TableField("room_number")
- private String roomNumber;
-
- @ApiModelProperty(value = "建筑面积")
- @TableField("building_area")
- private Integer buildingArea;
+ private String tenantType;
@ApiModelProperty(value = "联系电话")
@NotBlank(message = "联系电话不能为空")
@@ -90,4 +80,16 @@
@TableField("mail_address")
private String mailAddress;
+ @ApiModelProperty(value = "登录账号")
+ @NotBlank(message = "登录账号不能为空")
+ @TableField("account")
+ private String account;
+
+ @ApiModelProperty(value = "登录密码")
+ @TableField("password")
+ private String password;
+ @ApiModelProperty(value = "微信openid")
+ @TableField("open_id")
+ private String openId;
+
}
--
Gitblit v1.7.1