From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
index c54f6da..996fde8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
@@ -36,7 +36,7 @@
private Long principalDepartmentId;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -110,11 +110,11 @@
this.principalDepartmentId = principalDepartmentId;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
--
Gitblit v1.9.2