Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 fae06da02f16a57b7f194c172b1b24e01df432c9

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

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

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