From 01e640e494e50448e9fac58fe34026bcf1fc2d4c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 四月 2025 21:22:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 45652ce..9e35655 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,18 +1,18 @@
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.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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 java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -47,7 +47,7 @@
@ApiModelProperty(value = "建筑面积")
@TableField("house_area")
- private Integer houseArea;
+ private String houseArea;
@ApiModelProperty(value = "户型")
@TableField("house_type")
@@ -80,6 +80,39 @@
@ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
@TableField("lease_status")
- private Integer leaseStatus;
+ private String leaseStatus;
+ @ApiModelProperty(value = "退租状态 1=未退租 2=退租申请中 3=已退租")
+ @TableField("rental_return_status")
+ private String rentalReturnStatus;
+
+ @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;
+
+ @ApiModelProperty(value = "所属街道id")
+ @TableField("street_id")
+ private String streetId;
+
+ @ApiModelProperty(value = "经度")
+ @TableField("longitude")
+ private BigDecimal longitude;
+
+ @ApiModelProperty(value = "纬度")
+ @TableField("latitude")
+ private BigDecimal latitude;
+
+ @ApiModelProperty(value = "营业部id")
+ @TableField("business_dept_id")
+ private String businessDeptId;
}
--
Gitblit v1.7.1