From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java
index 866069d..bcec63f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java
@@ -2,6 +2,7 @@
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;
@@ -12,39 +13,40 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@EncryptDecryptClass
@ApiModel("特殊人群信息返回参数")
public class EventSpecialPopulationDetailsVO {
@ApiModelProperty(value = "id")
- private Long id;
+ private Long id;
- @ApiModelProperty(value = "姓名")
- private String name;
+ @ApiModelProperty(value = "姓名")
+ private String name;
@ApiModelProperty(value = "手机号")
- @EncryptDecryptField
- private String phone;
+ @EncryptDecryptField
+ private String phone;
- @ApiModelProperty(value = "身份证号码")
- @EncryptDecryptField
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
private String idCard;
@ApiModelProperty(value = "标签")
- private String label;
+ private String label;
@ApiModelProperty(value = "居住地址")
- private String address;
+ private String address;
@ApiModelProperty(value = "民族")
- private String nation;
+ private String nation;
@ApiModelProperty(value = "年龄")
- private Integer age;
+ private Integer age;
- @ApiModelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- private Integer politicalOutlook;
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
}
--
Gitblit v1.7.1