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 | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 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
new file mode 100644
index 0000000..cca42c8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
@@ -0,0 +1,95 @@
+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.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>
+ * 租户
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_tenant")
+@ApiModel(value="TTenant对象", description="租户")
+public class TTenant extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "住户名称")
+ @NotBlank(message = "住户名称不能为空")
+ @TableField("resident_name")
+ private String residentName;
+
+ @ApiModelProperty(value = "入住时间")
+ @NotNull(message = "入住时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField("checkIn_time")
+ private LocalDate checkinTime;
+
+ @ApiModelProperty(value = "租户属性")
+ @TableField("tenant_attributes")
+ private String tenantAttributes;
+
+ @ApiModelProperty(value = "租户类型")
+ @TableField("tenant_type")
+ private String tenantType;
+
+ @ApiModelProperty(value = "联系电话")
+ @NotBlank(message = "联系电话不能为空")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "证件号码")
+ @NotBlank(message = "证件号码不能为空")
+ @TableField("id_card")
+ private String idCard;
+
+ @ApiModelProperty(value = "邮箱")
+ @TableField("email")
+ private String email;
+
+ @ApiModelProperty(value = "银行转账专号")
+ @NotBlank(message = "银行转账专号不能为空")
+ @TableField("bank_number")
+ private String bankNumber;
+
+ @ApiModelProperty(value = "通讯地址")
+ @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