Merge branch 'test' into 'master'

罗元桥

2021-08-02 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java

@@ -32,7 +32,11 @@
    @ApiModelProperty(value = "网格员上班结束时间")
    private Integer workEndTime;
    @ApiModelProperty(value = "市平台网格员关联id")
    private Long lcMemberId;
    private String lcMemberId;
    @ApiModelProperty(value = "市平台网格员关联名称")
    private String lcMemberName;
    @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
    private String lcBindUserId;
    @ApiModelProperty(value = "网格员关联楼栋信息")
    private List<GridMemberBuildingVO> memberBuildingList;