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

@@ -8,12 +8,14 @@
public class EmergencySuppliesMaintainReqDTO {

    private Long id;

    //物资id
    private Long suppliesId;
    //保养结果
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;

    //包养人列表
    private List<EmergencySuppliesMaintainUserReqDTO> userList;