Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

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

@@ -1,14 +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 lombok.Data;

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

/**
 * @description: 批量导入刑释人员
@@ -74,7 +75,7 @@
    private String mainRelatives;

    @ExcelProperty(value = "与人员关系", index = 18)
    private Integer patientRelation;
    private String patientRelation;

    @ExcelProperty(value = "列管原因及类型", index = 19)
    private String rehabReasonAndType;