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

songhuangfeng123

2022-07-27 9ac04e8335b18ffbe2a3d7bc16f9f51a7404ec85

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamMemberInfoDO.java

@@ -12,7 +12,7 @@

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

@@ -41,11 +41,11 @@
        this.teamId = teamId;
    }

    public String getUserUid() {
    public Long getUserUid() {
        return userUid;
    }

    public void setUserUid(String userUid) {
    public void setUserUid(Long userUid) {
        this.userUid = userUid;
    }