Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java

@@ -16,6 +16,6 @@
    @ApiModelProperty("邻里圈id")
    private Long circleId;

    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}