Merge branch 'hemenkou_dev' into dev

101captain

2022-03-14 0965590521cd58e6fcc8d2ac97f4fa6b01e3e67e

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

@@ -31,4 +31,10 @@

    @ExcelProperty(value = "所属社区", index = 5)
    private String communityName;

    @ExcelProperty(value = "报道单位", index = 6)
    private String checkUnitName;

    @ExcelProperty(value = "党龄", index = 7)
    private Integer partyAge;
}