From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 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 e1b28d8..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("文化程度")
@@ -102,11 +113,11 @@
     private String address;
 
     @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAt;
 
     @ApiModelProperty("修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateAt;
 
     @ApiModelProperty("是否残疾人 0 否 1是")
@@ -114,7 +125,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