From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 9d06d9e..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,18 +1,21 @@
package com.panzhihua.common.model.vos.user;
+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;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
/**
* @description: 居民数据信息
@@ -25,6 +28,7 @@
public class InputUserInfoVO implements Serializable {
@ApiModelProperty("用户编号")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("生日")
@@ -122,7 +126,6 @@
@ApiModelProperty("专享政策")
private String tags;
-
@ApiModelProperty("年龄")
private Integer age;
@@ -135,4 +138,9 @@
@ApiModelProperty("房屋信息")
private List<ComMngStructHouseVO> comMngStructHouseVOS;
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty("地区号")
+ private String houseNum;
}
--
Gitblit v1.7.1