From 833893d56463f64332d5f5a3abcf774e8ad3f9c5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 19 七月 2022 17:31:33 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
index 58b9d67..1df9ec5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -6,7 +6,7 @@
private Long id;
- private String principalUid;
+ private Long principalUid;
private Long principalDepartmentId;
@@ -22,7 +22,7 @@
private List<EmergencyTeamFileReqDTO> fileList;
- private List<EmergencyTeamMemberReqDTO> MemberList;
+ private List<EmergencyTeamMemberReqDTO> memberList;
public Long getId() {
return id;
@@ -32,11 +32,11 @@
this.id = id;
}
- public String getPrincipalUid() {
+ public Long getPrincipalUid() {
return principalUid;
}
- public void setPrincipalUid(String principalUid) {
+ public void setPrincipalUid(Long principalUid) {
this.principalUid = principalUid;
}
@@ -97,18 +97,18 @@
}
public List<EmergencyTeamMemberReqDTO> getMemberList() {
- return MemberList;
+ return memberList;
}
public void setMemberList(List<EmergencyTeamMemberReqDTO> memberList) {
- MemberList = memberList;
+ this.memberList = memberList;
}
@Override
public String toString() {
return "EmergencyTeamReqDTO{" +
"id=" + id +
- ", principalUid='" + principalUid + '\'' +
+ ", principalUid=" + principalUid +
", principalDepartmentId=" + principalDepartmentId +
", teamLevel='" + teamLevel + '\'' +
", teamName='" + teamName + '\'' +
@@ -116,7 +116,7 @@
", telephoneNumber='" + telephoneNumber + '\'' +
", teamDesc='" + teamDesc + '\'' +
", fileList=" + fileList +
- ", MemberList=" + MemberList +
+ ", memberList=" + memberList +
'}';
}
}
--
Gitblit v1.9.2