Merge branch 'test' into 'master'

罗元桥

2021-08-05 37018ce6810f4855f43374f47cbd7b5e0d70d5a5

 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;
}