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/IntegerIdentityEntity.java

@@ -1,6 +1,5 @@
package com.yihu.jw.entity;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
@@ -19,13 +18,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    @GeneratedValue(generator = "generator")
/*    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    @Column(name = "id", unique = true, nullable = false)*/
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
/*    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

common/common-entity/src/main/java/com/yihu/jw/entity/base/words/BaseImportSensitiveDO.java

@@ -15,7 +15,7 @@ import javax.persistence.Table;
@Table(name = "base_import_sensitive")
public class BaseImportSensitiveDO extends UuidIdentityEntityWithOperator {
    @Column(name = "row")
    @Column(name = "row_id")
    private String row;
    @Column(name = "problem")
@@ -27,6 +27,7 @@ public class BaseImportSensitiveDO extends UuidIdentityEntityWithOperator {
    @Column(name = "operator")
    private String operator;
    @Column(name = "row_id")
    public String getRow() {
        return row;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleUserDO.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.hospital.article;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -31,6 +32,7 @@ public class KnowledgeArticleUserDO extends UuidIdentityEntityWithOperator {
	@Transient
	KnowledgeArticleDO knowledgeArticleDO;
	@Column(name = "user_code")
	public String getUser() {
		return user;
	}
@@ -87,6 +89,7 @@ public class KnowledgeArticleUserDO extends UuidIdentityEntityWithOperator {
		this.isRead = isRead;
	}
	@Column(name = "is_share")
	public Integer getShare() {
		return share;
	}