Merge branch 'huacheng' into huacheng_test

101captain

2022-07-08 2502a5bf8061852d381e3246d5f63e7ff6b0bf78

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