Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleErrorExcelVo.java

New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.vos.partybuilding.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author lyq
 * 分页查询党建数据统计返回参数
 */
@Data
@ApiModel("分页查询党建数据统计返回参数")
public class ComPbMemberRoleErrorExcelVo {


    @ExcelProperty(value = "*党员姓名", index = 0)
    private String name;

    @ExcelProperty(value = "*身份证号", index = 1)
    private String idCard;

    @ExcelProperty(value = "*手机号", index = 2)
    private String phone;

    @ExcelProperty(value = "党委标签(社区党委/区域党委委员)", index = 3)
    private String typeName;

    @ExcelProperty(value = "*入党日期(格式：年-月-日)", index = 4)
    private String joinTime;

    @ExcelProperty(value = "转正日期(格式：年-月-日)", index = 5)
    private String employmentTime;

    @ExcelProperty(value = "职位", index = 6)
    private String position;

    @ExcelProperty(value = "岗位职责", index = 7)
    private String jobResponsibilities;

    @ExcelProperty(value = "错误信息", index = 8)
    private String error;

}