Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

zhaozhengjie

2022-09-29 d4e3d2ce70f38f5a41ce336e62102e4da8698ba1

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

@@ -37,6 +37,6 @@
    @ExcelProperty(value = "岗位职责", index = 7)
    private String jobResponsibilities;

    @ExcelProperty(value = "负责党支部", index = 8)
    @ExcelProperty(value = "负责党组织", index = 8)
    private String org;
}