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

songhuangfeng123

2022-07-18 00e40ce8b1de4da44d427a80f46d69fb90a9c075

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java

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

    private Long teamId;

    private String userUid;
    private Long userUid;

    private Byte gender;

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