Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -233,6 +233,8 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    private String  operator;
    private String source;//来源
    @Column(name = "operator")
    public String getOperator() {
        return operator;
@@ -598,4 +600,14 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setPayStatus(Integer payStatus) {
        this.payStatus = payStatus;
    }
    @Column(name = "source")
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyOutpatientVO.java

@@ -1,10 +1,10 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVO;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
@@ -217,6 +217,9 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    @ApiModelProperty(value = "检查项目", example = "检查项目")
    private List<WlyyInspectionVO> inspectionVOS;
    @ApiModelProperty(value = "来源", example = "来源")
    private String source;
    public String getAdmNo() {
@@ -489,4 +492,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    public void setInspectionVOS(List<WlyyInspectionVO> inspectionVOS) {
        this.inspectionVOS = inspectionVOS;
    }
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
}