Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java

@@ -6,6 +6,26 @@

public class EmergencyWorkApproveDBQuery {

    private Integer relateType;

    private Long relateId;

    public Integer getRelateType() {
        return relateType;
    }

    public void setRelateType(Integer relateType) {
        this.relateType = relateType;
    }

    public Long getRelateId() {
        return relateId;
    }

    public void setRelateId(Long relateId) {
        this.relateId = relateId;
    }

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