From b0b9a8f3c2840d25c4cfe336bbefaaa56e11b69f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 13 二月 2025 14:31:51 +0800
Subject: [PATCH] 小程序登录
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 82 ++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 45 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..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
@@ -1,15 +1,23 @@
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.LocalDate;
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;
import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* <p>
@@ -17,53 +25,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")
+ @NotBlank(message = "住户名称不能为空")
+ @TableField("resident_name")
private String residentName;
@ApiModelProperty(value = "入住时间")
- @TableField("checkInTime")
- private LocalDateTime checkInTime;
+ @NotNull(message = "入住时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField("checkIn_time")
+ private LocalDate checkinTime;
@ApiModelProperty(value = "租户属性")
- @TableField("tenantAttributes")
+ @TableField("tenant_attributes")
private String tenantAttributes;
@ApiModelProperty(value = "租户类型")
- @TableField("tenantType")
- private Integer tenantType;
-
- @ApiModelProperty(value = "租户楼栋")
- @TableField("tenantBuilding")
- private String tenantBuilding;
-
- @ApiModelProperty(value = "房号")
- @TableField("roomNumber")
- private String roomNumber;
-
- @ApiModelProperty(value = "建筑面积")
- @TableField("buildingArea")
- private Integer buildingArea;
+ @TableField("tenant_type")
+ private String tenantType;
@ApiModelProperty(value = "联系电话")
+ @NotBlank(message = "联系电话不能为空")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "证件号码")
- @TableField("idCard")
+ @NotBlank(message = "证件号码不能为空")
+ @TableField("id_card")
private String idCard;
@ApiModelProperty(value = "邮箱")
@@ -71,33 +72,24 @@
private String email;
@ApiModelProperty(value = "银行转账专号")
- @TableField("bankNumber")
+ @NotBlank(message = "银行转账专号不能为空")
+ @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 = "登录账号")
+ @NotBlank(message = "登录账号不能为空")
+ @TableField("account")
+ private String account;
- @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;
-
+ @ApiModelProperty(value = "登录密码")
+ @TableField("password")
+ private String password;
+ @ApiModelProperty(value = "微信openid")
+ @TableField("open_id")
+ private String openId;
}
--
Gitblit v1.7.1