From 2e6ae80c0271e5e45faa399ce94cd44678cce43f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:58:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
index 3a220af..5144d42 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
@@ -1,8 +1,11 @@
package com.panzhihua.common.model.vos.grid;
+import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel("管理后台-网格员返回参数")
@@ -28,5 +31,13 @@
private Integer workStartTime;
@ApiModelProperty(value = "网格员上班结束时间")
private Integer workEndTime;
+ @ApiModelProperty(value = "市平台网格员关联id")
+ private String lcMemberId;
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+ @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
+ private String lcBindUserId;
+ @ApiModelProperty(value = "网格员关联楼栋信息")
+ private List<GridMemberBuildingVO> memberBuildingList;
}
--
Gitblit v1.7.1