Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3

 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;
    }