From 80e22bcc7af8aebed7443965655542fbe4966708 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 15:11:55 +0800
Subject: [PATCH] 灌溉计划删除,所有命令发布都失败依然允许终止

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
index 0a5b7d1..c95c72b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
@@ -1,5 +1,6 @@
 package com.dy.pipIrrGlobal.voIr;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
@@ -14,7 +15,7 @@
  */
 
 @Data
-@JsonPropertyOrder({"planName", "projectName", "planStartTime", "planStopTime", "groups"})
+@JsonPropertyOrder({"planName", "projectName", "state", "planStartTime", "planStopTime", "groups"})
 public class VoPlanDetails {
     private static final long serialVersionUID = 202504091125001L;
 
@@ -29,13 +30,20 @@
     private String projectName;
 
     /**
+     * 鐏屾簤璁″垝鐘舵��
+     */
+    private Integer state;
+
+    /**
      * 鐏屾簤璁″垝寮�濮嬫椂闂�
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date planStartTime;
 
     /**
      * 鐏屾簤璁″垝缁撴潫鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date planStopTime;
 
     /**

--
Gitblit v1.8.0