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/query/EmergencyWorkApproveQuery.java

@@ -5,9 +5,9 @@
import java.util.Date;

public class EmergencyWorkApproveQuery {

    //关联业务类型 1:应急预案
    private Integer relateType;

    //业务id
    private Long relateId;

    public Integer getRelateType() {
@@ -25,10 +25,10 @@
    public void setRelateId(Long relateId) {
        this.relateId = relateId;
    }

    //开始时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;

    //结束时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;