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/model/dto/req/EmergencySuppliesInspectUserReqDTO.java

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


public class EmergencySuppliesInspectUserReqDTO {

    //人员名称
    private String userName;

    public String getUserName() {
@@ -14,8 +14,9 @@
    }

    private Long id;

    //检查id
    private Long inspectId;
    //人员uid
    private Long userUid;

    public Long getId() {