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

liurunyu

2 天以前 031ab702d1a6c08c5339b9f5f4514c6879941a97

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIntake.java

@@ -11,7 +11,7 @@
 */

@Data
@JsonPropertyOrder({"intakeName", "rtuAddr", "isOnLine"})
@JsonPropertyOrder({"intakeName", "rtuAddr", "isOnLine", "isOpen"})
public class VoIntake {
    private static final long serialVersionUID = 202504181410001L;

@@ -29,4 +29,9 @@
     * 是否在线
     */
    private Boolean isOnLine;

    /**
     * 是否打开
     */
    private Boolean isOpen;
}