Commit 5745f4e4 authored by chenzhao's avatar chenzhao

修改bug

parent c14c914a
...@@ -31,7 +31,7 @@ public class BuildingVideoVO { ...@@ -31,7 +31,7 @@ public class BuildingVideoVO {
private String token; private String token;
@ApiModelProperty("位置") @ApiModelProperty("位置")
private String location = "1楼202房间"; private String location ;
@ApiModelProperty("设备id") @ApiModelProperty("设备id")
private Long specificId; private Long specificId;
......
...@@ -88,7 +88,7 @@ public class AlertCallePowerTransferRo implements Serializable{ ...@@ -88,7 +88,7 @@ public class AlertCallePowerTransferRo implements Serializable{
private String powerTransType; private String powerTransType;
//bug 5973 //bug 5973
@Label(value = "类别") // @Label(value = "类别")
private Integer category; // private Integer category;
} }
...@@ -266,8 +266,8 @@ public class RuleAlertCalledService { ...@@ -266,8 +266,8 @@ public class RuleAlertCalledService {
if (alertCalledFormDto == null) { if (alertCalledFormDto == null) {
return false; return false;
} }
//任务型计划 // bug 5973 /* //任务型计划 // bug 5973
alertCallePowerTransferRo.setCategory(RuleTypeEnum.任务型计划生成.getCategory()); alertCallePowerTransferRo.setCategory(RuleTypeEnum.任务型计划生成.getCategory());*/
AlertCalled alertCalled = alertCalledFormDto.getAlertCalled(); AlertCalled alertCalled = alertCalledFormDto.getAlertCalled();
alertCallePowerTransferRo alertCallePowerTransferRo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment