Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-31 b22a45c73c7d3dfdabcd7a0fd8a3b93263a0dfa9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitErrorExcelVO.java

@@ -24,6 +24,6 @@
    @ExcelProperty(value = "负责人联系电话", index = 3)
    private String phone;

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