Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-30 c7450a8e1724528046af3683d49eaf0a06785130

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

@@ -55,7 +55,10 @@
    private Long gridCommunityId;

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

    @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
    private String lcGridName;

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