From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
index 766edf1..c6496af 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfo.java
@@ -26,7 +26,7 @@
private Long userUid;
- private Byte gender;
+ private Boolean gender;
private String jobNumber;
@@ -100,11 +100,11 @@
this.userUid = userUid;
}
- public Byte getGender() {
+ public Boolean getGender() {
return gender;
}
- public void setGender(Byte gender) {
+ public void setGender(Boolean gender) {
this.gender = gender;
}
--
Gitblit v1.9.2