Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityMistakeExcelVO.java

@@ -1,13 +1,12 @@
package com.panzhihua.common.model.vos.community;

import java.io.Serializable;

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 lombok.Data;

import java.io.Serializable;
import java.util.List;
import lombok.Data;

/**
 * @description: 批量导入残疾人
@@ -30,7 +29,7 @@
    @ExcelProperty(value = "办证状况", index = 3)
    private String certificateSituation;

    @ExcelProperty(value = "文化程度" ,index = 4)
    @ExcelProperty(value = "文化程度", index = 4)
    private String cultureLevel;

    @ExcelProperty(value = "民族", index = 5)