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/EmergencyTeamMemberInfoDO.java

@@ -14,7 +14,7 @@

    private Long userUid;

    private Byte gender;
    private Boolean gender;

    private String jobNumber;

@@ -49,11 +49,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;
    }