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

huanghongfa

2021-10-15 08eefab8f0b04018dc62928ec2191bcae9d3e7d0

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

@@ -32,9 +32,14 @@
    @ExcelProperty(value = "认证时间", index = 4)
    private String authDate;

    @ExcelProperty(value = "健在（是/否）", index = 5)
    private String isAlive;
    @ExcelProperty(value = "认证期数", index = 5)
    private String authPeriod;

    @ExcelProperty(value = "错误信息", index = 6)
    @ExcelProperty(value = "标记", index = 6)
    private String mark;

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


}