代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -18,6 +18,6 @@
    @ApiModelProperty("发布图片")
    private String releaseImages;

    @ApiModelProperty(value = "当前登陆人id",hidden = true)
    @ApiModelProperty(value = "当前登陆人id", hidden = true)
    private Long userId;
}