From d76c9f4e730422cbe43496adfc57a6e3d36577ab Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期二, 01 三月 2022 13:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 43daadb..8a00d59 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,9 +1,10 @@
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;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,6 +15,7 @@
public class ComHouseMemberVo {
@ApiModelProperty("房屋成员用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long populId;
@ApiModelProperty("姓名")
@@ -21,7 +23,7 @@
@ApiModelProperty("手机号")
@EncryptDecryptField
-// @Sensitive(strategy = SensitiveStrategy.PHONE)
+ // @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
@ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
@@ -30,6 +32,9 @@
@ApiModelProperty("年龄")
private Integer age;
+ @ApiModelProperty("出生年月")
+ private String birthDay;
+
@ApiModelProperty("健康状况")
private String healthy;
--
Gitblit v1.7.1