Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

tangxiaobao

2022-02-22 4e1bb5d40063abfa1f43206b4ba91a26fac1cae7

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

@@ -21,6 +21,6 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "1.本年 2.")
    private Integer type;
    @ApiModelProperty(value = "年份")
    private Integer month;
}