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/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_id")
    @Column(name = "row_num")
    private String row;
    @Column(name = "problem")
@@ -27,7 +27,7 @@ public class BaseImportSensitiveDO extends UuidIdentityEntityWithOperator {
    @Column(name = "operator")
    private String operator;
    @Column(name = "row_id")
    @Column(name = "row_num")
    public String getRow() {
        return row;
    }