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