合并代码
This commit is contained in:
@@ -19,7 +19,7 @@ public class RStatOrgParam extends StatisticsBizBaseParam {
|
||||
@ApiModelProperty(name = "monitorIds", value = "监测点名称")
|
||||
private String monitorName;
|
||||
|
||||
@ApiModelProperty(name = "voltageLevel", value = "电压等级")
|
||||
@ApiModelProperty(name = "voltageLevels", value = "电压等级")
|
||||
private List<String> voltageLevels;
|
||||
|
||||
@ApiModelProperty(name = "powerrIds",value = "变电站id")
|
||||
@@ -31,7 +31,7 @@ public class RStatOrgParam extends StatisticsBizBaseParam {
|
||||
@ApiModelProperty(name = "monitorSort", value = "监测点类别")
|
||||
private List<String> monitorSort;
|
||||
|
||||
@ApiModelProperty(name = "voltageLevels", value = "电压等级")
|
||||
private List<String> voltageLevels;
|
||||
// @ApiModelProperty(name = "voltageLevels", value = "电压等级")
|
||||
// private List<String> voltageLevels;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,12 @@ public class RStatSubstationOrgVO implements Serializable {
|
||||
@ApiModelProperty(name = "orgName", value = "单位名称")
|
||||
private String orgName;
|
||||
|
||||
/**
|
||||
* 监测点类别ID、监测对象类型ID
|
||||
*/
|
||||
@ApiModelProperty(name = "measurement_type_class", value = "监测点类别ID、监测对象类型ID")
|
||||
private String measurementTypeClass;
|
||||
|
||||
/**
|
||||
* 生成数据的时间,每年统计一次
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user