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

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

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

@@ -2,6 +2,16 @@

public class EmergencySuppliesMaintainUserRespDTO {

    private String userName;

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    private Long id;

    private Long maintainId;