From df1de6a8ca9bf6af14d858fb51d077c00dd2dd48 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 13:08:41 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java
index 62affa3..20a8de8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java
@@ -1,5 +1,8 @@
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 com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
@@ -8,21 +11,39 @@
import lombok.Data;
@Data
-@ApiModel("房屋成员信息")
+@ApiModel("户主关系对象")
+@EncryptDecryptClass
public class ComHouseMemberVo {
@ApiModelProperty("房屋成员用户id")
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populId;
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("手机号")
@EncryptDecryptField
- @Sensitive(strategy = SensitiveStrategy.PHONE)
+// @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
- @ApiModelProperty("与户主关系")
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
private String relation;
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("出生年月")
+ private String birthDay;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("身份证号")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
}
--
Gitblit v1.7.1