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/EmergencySuppliesInspectReqDTO.java

@@ -10,12 +10,14 @@
public class EmergencySuppliesInspectReqDTO {

    private Long id;

    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;

    //检查人列表
    private List<EmergencySuppliesInspectUserReqDTO> userList;