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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -76,10 +76,10 @@
    private String controlStatus;

    @ExcelProperty(value = "入伍时间", index = 19)
    private String enlistString;
    private String enlistDate;

    @ExcelProperty(value = "入伍时间", index = 20)
    private String retireString;
    private String retireDate;

    @ExcelProperty(value = "人员类别", index = 21)
    private String personCategory;