增加产品型号和类型字段

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/AlarmTypeDto.java

@@ -84,9 +84,7 @@ public class AlarmTypeDto {
     @ApiModelProperty(value = "水表数目")
     private Integer numberOfWaterMeters;
     @ApiModelProperty(value = "产品类型")
-    @JsonIgnore
     private String categoryName;
     @ApiModelProperty(value = "设备型号")
-    @JsonIgnore
     private String productName;
 }