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

@@ -1,15 +1,16 @@
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.math.BigDecimal;
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 lombok.Data;

/**
 * @description: 批量导入低保户
@@ -38,7 +39,7 @@
    @ExcelProperty(value = "家庭编码", index = 5)
    private String familyCode;

    @ExcelProperty(value = "组名称" ,index = 6)
    @ExcelProperty(value = "组名称", index = 6)
    private String groupName;

    @ExcelProperty(value = "分类救助类别", index = 7)
@@ -169,7 +170,7 @@
    private Integer age;

    /**
     * 性别（1.男  2.女）
     * 性别（1.男 2.女）
     */
    private Integer sex;