From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期二, 22 六月 2021 16:07:50 +0800 Subject: [PATCH] Merge branch 'test' into 'test_screen' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java index 961d48e..cb2e58f 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java @@ -1,5 +1,6 @@ package com.panzhihua.common.model.dtos.community; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -33,16 +34,19 @@ * 名字 */ @ExcelProperty(value = "名字" ,index = 0) + @Excel(name = "姓名(必填项)", width = 20, isImportField = "true_st") private String name; /** * 身份证号码 */ @ExcelProperty(value = "身份证号码" ,index = 1) + @Excel(name = "身份证号码(必填项)", width = 20, isImportField = "true_st") private String cardNo; /** * 残疾人证编码 */ @ExcelProperty(value = "残疾人证编码" ,index = 2) + @Excel(name = "残疾人证编码(必填项)", width = 20, isImportField = "true_st") private String disableSn; /** * 出生年月 @@ -51,12 +55,14 @@ /** * 残疾人证 */ - @ExcelProperty(value = "残疾人证" ,index = 3) + @ExcelProperty(value = "残疾人证类型" ,index = 3) + @Excel(name = "残疾人证类型(必填项)", width = 20, isImportField = "true_st") private String level; /** * 性别(取字典表国家编码) */ @ExcelProperty(value = "性别" ,index = 4) + @Excel(name = "性别(必填项)", width = 20, isImportField = "true_st") private String sex; /** * 性别名称 @@ -66,36 +72,43 @@ * 文化程度(取字典表国家编码)) */ @ExcelProperty(value = "文化程度" ,index = 5) + @Excel(name = "文化程度(必填项)", width = 20, isImportField = "true_st") private String cultureLevel; /** * 民族 */ @ExcelProperty(value = "民族" ,index = 6) + @Excel(name = "民族(必填项)", width = 20, isImportField = "true_st") private String nation; /** * 残疾部位/类别 */ - @ExcelProperty(value = "残疾部位" ,index = 7) + @ExcelProperty(value = "残疾类别" ,index = 7) + @Excel(name = "残疾类别(必填项)", width = 20, isImportField = "true_st") private String disableType; /** * 残疾级别 */ @ExcelProperty(value = "残疾级别" ,index = 8) + @Excel(name = "残疾级别(必填项)", width = 20, isImportField = "true_st") private String disableLevel; /** * 联系电话 */ @ExcelProperty(value = "联系电话" ,index = 9) + @Excel(name = "联系电话(必填项)", width = 20, isImportField = "true_st") private String phone; /** * 监护人联系电话 */ @ExcelProperty(value = "监护人联系电话" ,index =10) + @Excel(name = "监护人联系电话(必填项)", width = 20, isImportField = "true_st") private String guardianPhone; /** * 地址 */ @ExcelProperty(value = "地址" ,index = 11) + @Excel(name = "地址(必填项)", width = 20, isImportField = "true_st") private String address; /** * 创建用户 -- Gitblit v1.7.1