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/article/KnowledgeArticleDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.hospital.article;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -40,6 +41,7 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	private Integer readCount;//已读数
	private Integer collection;//收藏数量
	private Integer fabulous;//点赞数量
	@Column(name = "is_share")
	private Integer share;//分享 数量
	private String intro;//简介
@@ -233,6 +235,7 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
		this.fabulous = fabulous;
	}
	@Column(name = "is_share")
	public Integer getShare() {
		return share;
	}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseBannerDO.java

@@ -1,13 +1,10 @@
package com.yihu.jw.entity.hospital.message;
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;
import java.util.Date;
/**
 * @author zmk
@@ -21,29 +18,35 @@ public class BaseBannerDO extends UuidIdentityEntityWithOperator {
    /**
     *锦旗名称
     */
    @Column(name = "name")
    private String name;
    /*
      *医生id
     */
    @Column(name = "saas_id")
    private String saasId;
    /**
     *锦旗描述
     */
    @Column(name = "description")
    private String description;
    /**
     *锦旗图标
     */
    @Column(name = "img")
    private String img;
    /**
     * 排序
     */
    @Column(name = "sort")
    private Integer sort;
    /*
    *状态
     */
    @Column(name = "status")
    private Integer status;
    @Column(name = "saas_id")