Merge branch 'master' into test

device-api-service/src/main/java/com/xy/entity/DeviceSysinfo.java

@@ -119,7 +119,7 @@ public class DeviceSysinfo {
     /**
      * 设备型号
      */
-    private String deviceVersion;
+    private String deviceModel;
 
     /**
      * 创建时间

device-api/src/main/java/com/xy/dto/DeviceSysinfoDto.java

@@ -111,7 +111,7 @@ public class DeviceSysinfoDto {
         private Boolean isHaveLightSecond;
 
         @ApiModelProperty("设备型号")
-        private String deviceVersion;
+        private String deviceModel;
 
         @JsonDeserialize(using = LocalDateTimeDeserializer.class)
         @JsonSerialize(using = LocalDateTimeSerializer.class)