Merge branch 'test_bak' into 'master'

罗元桥

2021-09-29 161b77a90e4743a96b083a0653c3ae4b8245f589

 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;

}