代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java

@@ -18,5 +18,4 @@
    @ApiModelProperty("状态（1.显示 2.隐藏）")
    private Integer status;


}