代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

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

@@ -17,4 +17,7 @@

    @ApiModelProperty("发布图片")
    private String releaseImages;

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