Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

6 天以前 e5c29d6ac2b210a9385723598d79a42ae5a9679e

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java

@@ -1,6 +1,8 @@
package com.dy.pipIrrGlobal.voSt;

import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;

/**
@@ -10,19 +12,14 @@
 * @Description
 */
@Data
public class VoIntakeUnReported {

    /**
     * 取水口编号
     */
    private String intakeNum;
@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"
        ,"rtuAddr"
})
@EqualsAndHashCode(callSuper=false)
public class VoIntakeUnReported extends VoIntake{
    /**
     * 阀控器地址
     */
    private String rtuAddr;
    /**
     * 阀控器时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String rtuDt;
    public String rtuAddr;

}