From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
index fbb988c..0339f91 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
@@ -1,7 +1,9 @@
 package com.panzhihua.common.model.vos.user;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,12 +14,35 @@
 public class ComMngHouseVo {
 
     @ApiModelProperty("房屋id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long houseId;
+
+    @ApiModelProperty("人口id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long populId;
+
+    @ApiModelProperty("人和房屋关系’ (1.自住2、租住)(取字典表国家标准编码)")
+    private Integer relationId;
+
+    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)(取字典表国家标准编码)")
+    private Integer relation;
 
     @ApiModelProperty("房屋地址")
     private String address;
 
-    @ApiModelProperty("房屋状态")
+    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)(取字典表国家标准编码)")
     private Integer status;
 
+    @ApiModelProperty("是否居住地 1.是 0.否")
+    private Integer residence;
+
+    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)(取字典表国家标准编码)")
+    private Integer purpose;
+
+    @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)(取字典表国家标准编码)")
+    private Integer controlStatus;
+
+    @ApiModelProperty("关系主键id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
 }

--
Gitblit v1.7.1