Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java

@@ -51,9 +51,12 @@
    @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
    private List<Long> memberIds;

    @ApiModelProperty(value = "网格所属社区ID", hidden = true, example = "1")
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
    private Long lcGridId;

    @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
    private Long userId;