diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java index b273fa839..53d8b5558 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java @@ -42,10 +42,10 @@ public class EleEpdPqdVO implements Serializable { private String unit; @ApiModelProperty(value = "数据开始谐波次数") - private Integer harmStart; + private Double harmStart; @ApiModelProperty(value = "数据结束谐波次数") - private Integer harmEnd; + private Double harmEnd; @ApiModelProperty(value = "统计方式") private String statMethod; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml index 59273ef1d..02cabcdd8 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml @@ -3,19 +3,45 @@