From 86e51e9199540ca5fe29b49d5fbe2f3476a0449d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 21 一月 2025 15:53:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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..7ec52d0 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
@@ -14,6 +14,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 租户
@@ -34,10 +37,12 @@
     private String id;
 
     @ApiModelProperty(value = "住户名称")
+    @NotBlank(message = "住户名称不能为空")
     @TableField("resident_name")
     private String residentName;
 
     @ApiModelProperty(value = "入住时间")
+    @NotNull(message = "入住时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("checkIn_time")
     private LocalDateTime checkinTime;
@@ -63,10 +68,12 @@
     private Integer buildingArea;
 
     @ApiModelProperty(value = "联系电话")
+    @NotBlank(message = "联系电话不能为空")
     @TableField("phone")
     private String phone;
 
     @ApiModelProperty(value = "证件号码")
+    @NotBlank(message = "证件号码不能为空")
     @TableField("id_card")
     private String idCard;
 
@@ -75,6 +82,7 @@
     private String email;
 
     @ApiModelProperty(value = "银行转账专号")
+    @NotBlank(message = "银行转账专号不能为空")
     @TableField("bank_number")
     private String bankNumber;
 
@@ -82,4 +90,13 @@
     @TableField("mail_address")
     private String mailAddress;
 
+    @ApiModelProperty(value = "登录账号")
+    @NotBlank(message = "登录账号不能为空")
+    @TableField("account")
+    private String account;
+
+    @ApiModelProperty(value = "登录密码")
+    @TableField("password")
+    private String password;
+
 }

--
Gitblit v1.7.1