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 | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 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 07ed9a3..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
@@ -29,50 +29,51 @@
public static final long serialVersionUID = 202502201601001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 鐏屾簤璁″垝ID
- */
- @NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
- private Long planId;
+ * 鐏屾簤璁″垝ID
+ */
+ //@NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
+ //private Long planId;
/**
- * 杞亴缁処D
- */
+ * 杞亴缁処D
+ */
+ @NotNull(message = "杞亴缁処D涓嶈兘涓虹┖")
private Long groupId;
/**
- * 鐏屾簤鍗曞厓ID
- */
- private Long unitId;
-
- /**
- * 鐏屾簤寮�濮嬫椂闂�
- */
+ * 鐏屾簤寮�濮嬫椂闂�
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @NotNull(message = "鐏屾簤寮�濮嬫椂闂翠笉鑳戒负绌�")
private Date startTime;
- /**
- * 鐏屾簤缁撴潫鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @NotNull(message ="鐏屾簤缁撴潫鏃堕棿涓嶈兘涓虹┖")
- private Date stopTime;
+
/**
- * 鍙栨按鍙D鍒楄〃
- */
- private String intakeIds;
+ * 鐏屾簤缁撴潫鏃堕棿
+ */
+ //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ //private Date stopTime;
/**
- * 褰撳墠鐘舵��;1-姝ｅ父锛�2-鏆傚仠锛�3-缁堟
- */
+ * 鐏屾簤鏃堕暱;鍒嗛挓
+ */
+ private Integer duration;
+
+ /**
+ * 鍙栨按鍙D鍒楄〃
+ */
+ //private String intakeIds;
+
+ /**
+ * 褰撳墠鐘舵��;1-姝ｅ父锛�2-鏆傚仠锛�3-缁堟
+ */
private Byte currentState;
}
\ No newline at end of file
--
Gitblit v1.8.0