From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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..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
@@ -32,11 +32,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