From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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 eb538e9..31150c5 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,18 +1,19 @@
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.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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;
import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
/**
* <p>
@@ -34,13 +35,15 @@
private String id;
@ApiModelProperty(value = "住户名称")
+ @NotBlank(message = "住户名称不能为空")
@TableField("resident_name")
private String residentName;
@ApiModelProperty(value = "入住时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(message = "入住时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("checkIn_time")
- private LocalDateTime checkinTime;
+ private LocalDate checkinTime;
@ApiModelProperty(value = "租户属性")
@TableField("tenant_attributes")
@@ -48,25 +51,15 @@
@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 = "联系电话不能为空")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "证件号码")
+ @NotBlank(message = "证件号码不能为空")
@TableField("id_card")
private String idCard;
@@ -75,6 +68,7 @@
private String email;
@ApiModelProperty(value = "银行转账专号")
+ @NotBlank(message = "银行转账专号不能为空")
@TableField("bank_number")
private String bankNumber;
@@ -82,4 +76,32 @@
@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;
+
+ @ApiModelProperty(value = "法人")
+ @TableField("legal_person")
+ private String legalPerson;
+
+ @ApiModelProperty(value = "社会统一信用代码")
+ @TableField("credit_code")
+ private String creditCode;
+
+ @ApiModelProperty(value = "开户行")
+ @TableField("bank_name")
+ private String bankName;
+
+ @ApiModelProperty(value = "承租人")
+ @TableField("lessee")
+ private String lessee;
+
}
--
Gitblit v1.7.1