Merge remote-tracking branch 'origin/master' into master

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

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

@@ -4,6 +4,16 @@

public class EmergencySuppliesInspectUserRespDTO {

    private String userName;

    public String getUserName() {
        return userName;
    }

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

    private Long id;

    private Long inspectId;