Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

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