From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
index 5d324b9..fb44e33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
@@ -8,6 +8,8 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
+import java.util.List;
+
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -22,12 +24,12 @@
* @date 2021-05-26
* */
@Data
-@ApiModel("创建网格和网格员的关联关系请求参数")
+@ApiModel("创建网格员请求参数")
public class EventGridMemberAddDTO {
@NotBlank(message = "账号昵称不能为空")
@Length(max=50)
- @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
+ @ApiModelProperty(value = "账号昵称", example = "")
private String nickName;
@NotBlank(message = "登录账号不能为空")
@@ -38,7 +40,7 @@
@NotBlank(message = "登录密码不能为空")
@Length(min = 8, max=100)
@ApiModelProperty(value = "登录密码", hidden = false, example = "")
- private String passwd;
+ private String password;
@NotBlank(message = "联系电话不能为空")
@Length(max=11)
@@ -48,20 +50,19 @@
@NotNull(message = "工作开始时间不能为空")
@Max(24)
@ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
- private Integer workStartAt;
+ private Integer workStartTime;
@NotNull(message = "工作结束时间不能为空")
@Max(24)
@ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
- private String workEndAt;
+ private Integer workEndTime;
@Length(max=255)
@ApiModelProperty(value = "头像", hidden = false, example = "")
private String imageUrl;
- @NotBlank() @Length(max=100)
@ApiModelProperty(value = "账号状态", hidden = false, example = "")
- private String status;
+ private Integer status;
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
@@ -72,4 +73,13 @@
@ApiModelProperty(value = "社区ID", hidden = true, example = "1")
private Long communityId;
+ @ApiModelProperty(value = "网格员id", hidden = false, example = "")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联id")
+ private Long lcMemberId;
+
+ @ApiModelProperty(value = "楼栋id集合")
+ private List<Long> buildingIds;
+
}
--
Gitblit v1.7.1