From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java
index 4ccd1ae..abb95bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java
@@ -1,16 +1,15 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+
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;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
/**
* @auther txb
@@ -24,79 +23,79 @@
public class ComKeyPopulationVO {
/**
- * 主键id
- */
+ * 主键id
+ */
@ApiModelProperty("重点上访人员id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
- * 人口id
- */
+ * 人口id
+ */
@ApiModelProperty("人口id")
@JsonSerialize(using = ToStringSerializer.class)
private Long populationId;
/**
- * 街道id
- */
+ * 街道id
+ */
@ApiModelProperty("街道id")
@JsonSerialize(using = ToStringSerializer.class)
private Long streetId;
/**
- * 社区id
- */
+ * 社区id
+ */
@ApiModelProperty("社区id")
@JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
/**
- * 名字
- */
+ * 名字
+ */
@ApiModelProperty("名字")
private String name;
/**
- * 身份证号码
- */
+ * 身份证号码
+ */
@ApiModelProperty("身份证号码")
@EncryptDecryptField
private String cardNo;
/**
- * 联系电话
- */
+ * 联系电话
+ */
@ApiModelProperty("联系电话")
private String phone;
/**
- * 备注
- */
+ * 备注
+ */
@ApiModelProperty("备注")
private String remark;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@ApiModelProperty("创建时间")
private Date createAt;
/**
- * 创建用户
- */
+ * 创建用户
+ */
@ApiModelProperty("创建用户")
private Long createBy;
/**
- * 修改时间
- */
+ * 修改时间
+ */
@ApiModelProperty("修改时间")
private Date updateAt;
/**
- * 修改用户
- */
+ * 修改用户
+ */
@ApiModelProperty("修改用户")
private Long updateBy;
}
\ No newline at end of file
--
Gitblit v1.7.1