From 08e9685fa3f343f91c714489c9036bf5a9f8e49e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 一月 2024 20:26:20 +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/pojoPr/PrIntake.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
index 92a4428..7e0fea6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
@@ -15,6 +15,12 @@
import java.util.Date;
/**
+ * @author wuzeyu
+ * @date 2023/12/26 11:12
+ * @LastEditTime 2023/12/26 11:12
+ * @Description 鍙栨按鍙�
+ */
+/**
* 鍙栨按鍙ｈ〃
*/
@@ -26,7 +32,7 @@
@AllArgsConstructor
@Schema(name = "鍙栨按鍙ｅ疄浣�")
public class PrIntake implements BaseEntity {
- public static final long serialVersionUID = 202312260931001L;
+ public static final long serialVersionUID = 202401151517005L;
/**
* 涓婚敭
*/
@@ -72,7 +78,7 @@
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
@Schema(description = "鎵�鍦ㄧ墖鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�")
+// @NotNull(message = "鎵�鍦ㄧ墖鍖轰笉鑳戒负绌�")
private Long blockId;
/**
@@ -105,10 +111,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
--
Gitblit v1.8.0