From 93860049875e89890c32d22732329a6985dad898 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 三月 2025 17:06:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigatePlan.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigatePlan.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigatePlan.java
index cbaa7bf..3eb8770 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigatePlan.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigatePlan.java
@@ -17,7 +17,7 @@
*/
@Data
-@JsonPropertyOrder({"planId", "projectName", "planName", "startupMode", "startTime", "stopTime", "planState", "executingState"})
+@JsonPropertyOrder({"planId", "projectName", "planName", "startupMode", "startTime", "stopTime", "duration", "planState", "executingState"})
public class VoIrrigatePlan implements BaseEntity {
public static final long serialVersionUID = 202502241652001L;
@@ -55,12 +55,17 @@
private Date stopTime;
/**
+ * 鐏屾簤鏃堕暱
+ */
+ private Integer duration;
+
+ /**
* 璁″垝鐘舵�侊紱1-鑽夌锛�2-宸插彂甯�
*/
private String planState;
/**
- * 璁″垝鎵ц鐘舵��
+ * 璁″垝鎵ц鐘舵�侊紱1-鏈墽琛岋紝2-鎵ц涓紝3-宸叉殏鍋滐紝4-宸茬粓姝紝5-宸插畬鎴�
*/
private String executingState;
}
--
Gitblit v1.8.0