From 5ea8f496a9bc1fc33ecf12d0055efa157d070290 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 15 十二月 2021 17:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
index 7110626..0ffc9ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
@@ -1,14 +1,21 @@
package com.panzhihua.common.model.vos.user;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @description: 居民数据信息
@@ -17,9 +24,11 @@
*/
@Data
@ApiModel(value = "居民数据信息")
+@EncryptDecryptClass
public class InputUserInfoVO implements Serializable {
@ApiModelProperty("用户编号")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("生日")
@@ -45,6 +54,8 @@
private Integer maritalStatus;
@ApiModelProperty("联系方式")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
@ApiModelProperty("文化程度")
@@ -115,7 +126,6 @@
@ApiModelProperty("专享政策")
private String tags;
-
@ApiModelProperty("年龄")
private Integer age;
@@ -128,4 +138,9 @@
@ApiModelProperty("房屋信息")
private List<ComMngStructHouseVO> comMngStructHouseVOS;
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty("地区号")
+ private String houseNum;
}
--
Gitblit v1.7.1