From b4bc05b29aa6d71072efdf39caf1808b4e69eca4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 11:04:11 +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/pojoIr/IrIrrigateSchedule.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
index 65b50d0..8047670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
@@ -38,8 +38,8 @@
     /**
      * 鐏屾簤璁″垝ID
      */
-    @NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
-    private Long planId;
+    //@NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
+    //private Long planId;
 
     /**
      * 杞亴缁処D
@@ -53,11 +53,13 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
+
+
     /**
      * 鐏屾簤缁撴潫鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date stopTime;
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //private Date stopTime;
 
     /**
      * 鐏屾簤鏃堕暱;鍒嗛挓
@@ -67,7 +69,7 @@
     /**
      * 鍙栨按鍙D鍒楄〃
      */
-    private String intakeIds;
+    //private String intakeIds;
 
     /**
      * 褰撳墠鐘舵��;1-姝e父锛�2-鏆傚仠锛�3-缁堟

--
Gitblit v1.8.0