Merge branch 'dev' of liubing/wlyy2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/emergency/EmergencyOrderVO.java

@@ -1,6 +1,8 @@
package com.yihu.jw.restmodel.emergency;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.care.contacts.PatientSosContactsDO;
import com.yihu.jw.entity.care.securitymonitoring.BaseEmergencyWarnLogDO;
import com.yihu.jw.entity.care.securitymonitoring.EmergencyWarnConclusionDO;
@@ -296,6 +298,7 @@ public class EmergencyOrderVO {
        this.overTimeNotResponse = overTimeNotResponse;
    }
    @JSONField(name = "OrderType")
    public Integer getOrderType() {
        return OrderType;
    }