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

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/label/PatientLableService.java

common/common-entity/sql记录

@@ -1331,23 +1331,22 @@ CREATE TABLE `base_hvdevice_record` (
CREATE TABLE `base_hvdevice_sos_log` (
  `id` varchar(50) NOT NULL,
  `resourceID` varchar(50) DEFAULT NULL,
  `resourceSerial` varchar(50) DEFAULT NULL,
  `resourceName` varchar(50) DEFAULT NULL,
  `alarmNum` int(10) DEFAULT NULL,
  `alarmTime` varchar(50) DEFAULT NULL,
  `monitorValue` varchar(50) DEFAULT NULL,
  `alarmType` varchar(20) DEFAULT NULL,
  `systemType` varchar(20) DEFAULT NULL,
  `alarmID` varchar(50) DEFAULT NULL,
  `resourceType` varchar(50) DEFAULT NULL,
  `resource_id` varchar(50) DEFAULT NULL,
  `resource_serial` varchar(50) DEFAULT NULL,
  `resource_name` varchar(50) DEFAULT NULL,
  `alarm_num` int(10) DEFAULT NULL,
  `alarm_time` varchar(50) DEFAULT NULL,
  `monitor_value` varchar(50) DEFAULT NULL,
  `alarm_type` varchar(20) DEFAULT NULL,
  `system_type` varchar(20) DEFAULT NULL,
  `alarm_id` varchar(50) DEFAULT NULL,
  `resource_type` varchar(50) DEFAULT NULL,
  `location` varchar(500) DEFAULT NULL,
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='烟感气感设备报警日志记录表';
-- 2021-08-23 已执行
ALTER table `base`.`wlyy_devices` add column `device_type` tinyint(2) DEFAULT NULL COMMENT '设备种类 0健康设备 1安防设备'
-- 20210819

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/HvDeviceSosLog.java

@@ -29,7 +29,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
    private String resourceType;
    private String location;
    @Column(name = "resourceID")
    @Column(name = "resource_id")
    public String getResourceID() {
        return resourceID;
    }
@@ -38,7 +38,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.resourceID = resourceID;
    }
    @Column(name = "resourceSerial")
    @Column(name = "resource_serial")
    public String getResourceSerial() {
        return resourceSerial;
    }
@@ -47,7 +47,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.resourceSerial = resourceSerial;
    }
    @Column(name = "resourceName")
    @Column(name = "resource_name")
    public String getResourceName() {
        return resourceName;
    }
@@ -56,7 +56,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.resourceName = resourceName;
    }
    @Column(name = "alarmNum")
    @Column(name = "alarm_num")
    public Integer getAlarmNum() {
        return alarmNum;
    }
@@ -65,7 +65,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.alarmNum = alarmNum;
    }
    @Column(name = "alarmTime")
    @Column(name = "alarm_time")
    public String getAlarmTime() {
        return alarmTime;
    }
@@ -74,7 +74,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.alarmTime = alarmTime;
    }
    @Column(name = "monitorValue")
    @Column(name = "monitor_value")
    public String getMonitorValue() {
        return monitorValue;
    }
@@ -83,7 +83,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.monitorValue = monitorValue;
    }
    @Column(name = "alarmType")
    @Column(name = "alarm_type")
    public String getAlarmType() {
        return alarmType;
    }
@@ -92,7 +92,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.alarmType = alarmType;
    }
    @Column(name = "systemType")
    @Column(name = "system_type")
    public String getSystemType() {
        return systemType;
    }
@@ -101,7 +101,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.systemType = systemType;
    }
    @Column(name = "alarmID")
    @Column(name = "alarm_id")
    public String getAlarmID() {
        return alarmID;
    }
@@ -110,7 +110,7 @@ public class HvDeviceSosLog extends UuidIdentityEntityWithCreateTime{
        this.alarmID = alarmID;
    }
    @Column(name = "resourceType")
    @Column(name = "resource_type")
    public String getResourceType() {
        return resourceType;
    }