From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrOpeningSchedule.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrOpeningSchedule.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrOpeningSchedule.java
index e5bb0b1..a2bd808 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrOpeningSchedule.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrOpeningSchedule.java
@@ -29,28 +29,34 @@
public static final long serialVersionUID = 202502201600001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 鐏屾簤娆″簭ID
- */
+ * 鐏屾簤娆″簭ID
+ */
@NotNull(message = "鐏屾簤娆″簭ID涓嶈兘涓虹┖")
private Long scheduleId;
/**
- * 寮�闃�鏃堕棿
- */
+ * 鍙栨按鍙D
+ */
+ @NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖")
+ private Long intakeId;
+
+ /**
+ * 寮�闃�鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@NotNull(message = "寮�闃�鏃堕棿涓嶈兘涓虹┖")
private Date startTime;
/**
- * 鐏屾簤鏃堕暱;鍒嗛挓
- */
+ * 鐏屾簤鏃堕暱;鍒嗛挓
+ */
@NotNull(message = "鐏屾簤鏃堕暱涓嶈兘涓虹┖")
private Integer duration;
--
Gitblit v1.8.0