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

huanghongfa

2021-08-10 5513e69c82a82eb6be786d5cb8e23b81bffc8636

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