Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

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

@@ -7,7 +7,7 @@
import java.util.Date;

public class EmergencySuppliesMaintainPageRespDTO {

    //物资名称
    private String suppliesName;

    public String getSuppliesName() {
@@ -19,9 +19,11 @@
    }

    private Long id;

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