From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigateSchedule.java |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigateSchedule.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigateSchedule.java
index 9cd54f5..a416d54 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigateSchedule.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoIrrigateSchedule.java
@@ -1,9 +1,5 @@
 package com.dy.pipIrrGlobal.voIr;
 
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.dy.common.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
@@ -13,24 +9,27 @@
  * @author ZhuBaoMin
  * @date 2025-02-21 14:21
  * @LastEditTime 2025-02-21 14:21
- * @Description 鐏屾簤娆″簭瑙嗗浘瀵硅薄
+ * @Description 鐏屾簤娆″簭瑙嗗浘瀵硅薄锛岀敓鎴愬紑闃�璁″垝浣跨敤锛屼笉浼犵粰鍓嶇
  */
 
 @Data
-@JsonPropertyOrder({ "id", "vcNum", "money", "inUse", "isAlarmValue"})
-public class VoIrrigateSchedule implements BaseEntity {
+@JsonPropertyOrder({ "scheduleId", "groupId", "startTime", "duration"})
+public class VoIrrigateSchedule {
     private static final long serialVersionUID = 202502211423001L;
 
     /**
      * 鐏屾簤娆″簭ID
      */
-    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     private Long scheduleId;
+
+    /**
+     * 杞亴缁処D
+     */
+    private Long groupId;
 
     /**
      * 鐏屾簤寮�濮嬫椂闂�
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /**
@@ -38,8 +37,4 @@
      */
     private Integer duration;
 
-    /**
-     * 鍙栨按鍙D锛屽涓敤閫楀彿闅斿紑
-     */
-    private String intakeIds;
 }

--
Gitblit v1.8.0