Merge branch 'test_bak' into 'master'

罗元桥

2021-10-08 9ab16d88c1730f7db6f19cd2962e5286d919b297

 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;

}