From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java | 12 ++++++++++++
1 files changed, 12 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..a495352 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,5 +1,9 @@
package com.panzhihua.common.model.vos.grid;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,5 +32,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