| 
															
																@@ -14,7 +14,7 @@ import java.time.LocalDateTime; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 public class DeviceAlarmQueryDto { 
															 | 
															
															 | 
															
																 public class DeviceAlarmQueryDto { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiModelProperty(value = "设备id") 
															 | 
															
															 | 
															
																     @ApiModelProperty(value = "设备id") 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    private Integer deviceId; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    private Long deviceId; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiModelProperty(value = "分类id") 
															 | 
															
															 | 
															
																     @ApiModelProperty(value = "分类id") 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     private Integer categoryId; 
															 | 
															
															 | 
															
																     private Integer categoryId; 
															 |