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/THouse.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java
new file mode 100644
index 0000000..9a03ab2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java
@@ -0,0 +1,97 @@
+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.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;
+
+/**
+ * <p>
+ * 房屋管理
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_house")
+@ApiModel(value="THouse对象", description="房屋管理")
+public class THouse extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "房屋图片")
+ @TableField("house_picture")
+ private String housePicture;
+
+ @ApiModelProperty(value = "房屋名称")
+ @TableField("house_name")
+ private String houseName;
+
+ @ApiModelProperty(value = "地址")
+ @TableField("house_address")
+ private String houseAddress;
+
+ @ApiModelProperty(value = "建筑面积")
+ @TableField("house_area")
+ private String houseArea;
+
+ @ApiModelProperty(value = "户型")
+ @TableField("house_type")
+ private String houseType;
+
+ @ApiModelProperty(value = "业务属性")
+ @TableField("business_attributes")
+ private String businessAttributes;
+
+ @ApiModelProperty(value = "产品类型")
+ @TableField("product_type")
+ private String productType;
+
+ @ApiModelProperty(value = "产权人")
+ @TableField("property_right_person")
+ private String propertyRightPerson;
+
+ @ApiModelProperty(value = "产证编号")
+ @TableField("property_right_number")
+ private String propertyRightNumber;
+
+ @ApiModelProperty(value = "产权开始日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("property_right_start_time")
+ private LocalDateTime propertyRightStartTime;
+
+ @ApiModelProperty(value = "产权年限")
+ @TableField("property_right_duration")
+ private String propertyRightDuration;
+
+ @ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
+ @TableField("lease_status")
+ private String leaseStatus;
+ @ApiModelProperty(value = "楼栋")
+ @TableField("building")
+ private String building;
+ @ApiModelProperty(value = "房号")
+ @TableField("room_number")
+ private String roomNumber;
+ @ApiModelProperty(value = "产权人联系方式")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
+ @TableField(exist = false)
+ private String tenantType;
+}
--
Gitblit v1.7.1