Merge branch 'hcp' into test

device-api-service-merc-mini/src/main/java/com/xy/dto/MiniDeviceRecordsDto.java

@@ -33,7 +33,6 @@ public class MiniDeviceRecordsDto {
         private Long deviceId;
 
         @ApiModelProperty("故障类型")
-        @NotNull(message = "故障类型不能为空")
         private Integer errorType;
     }
 }