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

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalWaitingRoomDO.java

@@ -64,6 +64,11 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
	 * 咨询类型: 1图文 2视频 3图文+视频
	 */
	private Integer consultType;
	
	/**
	 * 门诊记录ID
	 */
	private String outpatientId;
	@Column(name = "saas_id")
@@ -137,7 +142,13 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }
	
	@Column(name = "outpatient_id")
	public String getOutpatientId() {
		return outpatientId;
	}
	
	public void setOutpatientId(String outpatientId) {
		this.outpatientId = outpatientId;
	}
}