Merge branch 'four_member' into 'test'

罗元桥

2021-09-26 f471925b9c18e816c070cbf4a9c581c8cadfeff5

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -31,4 +31,7 @@
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;

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

}