From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
index b119604..b933995 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.house.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -77,15 +74,15 @@
@ApiModelProperty(value = "绑定用户名称")
private String associatedUserName;
/**
- * 角色 0: 业主 1：出租户 2：空挂户 3：其他
+ * 角色
*/
- @ApiModelProperty(value = "角色 0: 业主 1：出租户 2：空挂户 3：其他")
+ @ApiModelProperty(value = "角色")
private Integer roleType;
/**
* 与角色关系
*/
@ApiModelProperty(value = "与角色关系")
- private String relationship;
+ private Integer relationship;
/**
* 是否主要联系人 1：是 0：否
@@ -128,35 +125,35 @@
@ApiModelProperty(value = "护照")
private String passport;
/**
- * 民族（WGCCP_ETHNICITY）
+ * 民族
*/
- @ApiModelProperty(value = "民族（WGCCP_ETHNICITY）")
- private String ethnicity;
+ @ApiModelProperty(value = "民族")
+ private Integer ethnicity;
/**
- * 学历（WGCCP_EDUCATION）
+ * 学历
*/
- @ApiModelProperty(value = "学历（WGCCP_EDUCATION）")
- private String education;
+ @ApiModelProperty(value = "学历")
+ private Integer education;
/**
* 户籍登记地
*/
@ApiModelProperty(value = "户籍登记地")
private String hukouRegistration;
/**
- * 工作状态（WGCCP_WORK_STATUS）
+ * 工作状态
*/
- @ApiModelProperty(value = "工作状态（WGCCP_WORK_STATUS）")
- private String workStatus;
+ @ApiModelProperty(value = "工作状态")
+ private Integer workStatus;
/**
* 工作单位
*/
@ApiModelProperty(value = "工作单位")
private String employer;
/**
- * 婚姻状态（WGCCP_MARITAL_STATUS）
+ * 婚姻状态
*/
- @ApiModelProperty(value = "婚姻状态（WGCCP_MARITAL_STATUS）")
- private String maritalStatus;
+ @ApiModelProperty(value = "婚姻状态")
+ private Integer maritalStatus;
/**
* 车牌号
*/
@@ -197,6 +194,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -212,6 +210,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
+ @TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
/**
@@ -227,4 +226,13 @@
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
+ /**
+ * 是否审核
+ */
+ @ApiModelProperty("是否审核 0:否：1 是")
+ private Integer confirmFlag;
+
+ @ApiModelProperty("出租屋id")
+ private Long housingRentalId;
+
}
--
Gitblit v1.9.3