Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 73f86cb94faa49f1157d6c9f00737a28f63507f4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java

@@ -40,6 +40,6 @@
    private String keyword;
    @ApiModelProperty("物业公司id")
    private Long propertyId;
    @ApiModelProperty("1是社区团队 2  党员先锋")
    @ApiModelProperty("1是社区团队 2党员先锋")
    private Integer type;
}