From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
index d950b1d..81da6e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.grid.admin;
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 io.swagger.annotations.ApiModel;
@@ -19,6 +21,7 @@
public class ComMngPopulationListVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("姓名")
@@ -45,10 +48,11 @@
private Integer politicalOutlook;
@ApiModelProperty("联系方式")
+ @EncryptDecryptField
private String phone;
@ApiModelProperty("关联实有房屋(0.否 1.是)")
- private String isHouse;
+ private Long isHouse;
@ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
private Integer eventStatus;
--
Gitblit v1.7.1