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/ComMngPopulationMistakeExcelVO.java

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

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 com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @description: 批量导入实有人口
@@ -100,8 +97,8 @@
    @ExcelProperty(value = "是否居住地(是/否)", index = 27)
    private String residence;

//    @ExcelProperty(value = "居住地址", index = 28)
//    private String address;
    // @ExcelProperty(value = "居住地址", index = 28)
    // private String address;

    @ExcelProperty(value = "人员类型（户籍人员/留守人员/外地人员/境外人员）", index = 28)
    private String personType;