From 94c34f08015c3f5f4d839354958aea88b31473a0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 11:13:07 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 f0dbc7c..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,11 +1,12 @@
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;
-
-import java.util.List;
@Data
@ApiModel("管理后台-网格员返回参数")
@@ -32,11 +33,9 @@
@ApiModelProperty(value = "网格员上班结束时间")
private Integer workEndTime;
@ApiModelProperty(value = "市平台网格员关联id")
- private Long lcMemberId;
- @ApiModelProperty(value = "市平台网格员id")
- private String lcGridMemberId;
- @ApiModelProperty(value = "市平台网格员名称")
- private String lcGridMemberName;
+ private String lcMemberId;
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
@ApiModelProperty(value = "浪潮网格员绑定的用户ID")
private String lcBindUserId;
@ApiModelProperty(value = "网格员关联楼栋信息")
--
Gitblit v1.7.1