Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

yanghui

2022-10-21 5f3cf501f9f6c216df17ee8af6618b55b537d21a

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