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/neighbor/ComActNeighborCircleAdminDTO.java

@@ -42,4 +42,7 @@
    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty("关键词")
    private String keyWord;

}