From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 24 十月 2022 13:48:24 +0800 Subject: [PATCH] #feat 修改别名 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java index 89f6de9..d87ac20 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java @@ -1,17 +1,15 @@ package com.panzhihua.common.model.vos.community; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + import com.alibaba.excel.annotation.ExcelProperty; import com.google.common.collect.Lists; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; -import com.panzhihua.common.validated.AddGroup; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.Date; -import java.util.List; +import lombok.Data; /** * @description: 批量导入退役军人 @@ -43,8 +41,8 @@ @ExcelProperty(value = "照片", index = 6) private String photo; - @ExcelProperty(value = "户籍性质(1.城镇户口 2.农村户口)", index = 7) - private Integer regiterNature; + @ExcelProperty(value = "户籍性质", index = 7) + private String regiterNature; @ExcelProperty(value = "户口所在地", index = 8) private String censusRegister; @@ -219,7 +217,7 @@ private Integer age; /** - * 性别(1.男 2.女) + * 性别(1.男 2.女) */ private Integer sex; -- Gitblit v1.7.1