代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 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;


}