Merge branch 'txb'

tangxiaobao

2021-08-05 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b

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

@@ -81,6 +81,6 @@
    @ExcelProperty(value = "其他", index = 20)
    private String other;

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