|
@@ -21,7 +21,7 @@ public class AlarmRuleDto {
|
|
|
* channelId
|
|
|
*/
|
|
|
@ApiModelProperty(value = "channelId")
|
|
|
- @JsonIgnore
|
|
|
+
|
|
|
private Integer productCategroyId;
|
|
|
/**
|
|
|
* siteId
|
|
@@ -97,13 +97,13 @@ public class AlarmRuleDto {
|
|
|
* value1
|
|
|
*/
|
|
|
@ApiModelProperty(value = "value1")
|
|
|
- @JsonIgnore
|
|
|
+
|
|
|
private String value1;
|
|
|
/**
|
|
|
* value2
|
|
|
*/
|
|
|
@ApiModelProperty(value = "value2")
|
|
|
- @JsonIgnore
|
|
|
+
|
|
|
private String value2;
|
|
|
/**
|
|
|
* measuingDataType
|