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/IrIrrigateGroup.java | 67 +++++++++++++--------------------
1 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateGroup.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateGroup.java
index 9c098d3..c202e78 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateGroup.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateGroup.java
@@ -6,21 +6,17 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
import lombok.*;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
import java.util.Date;
/**
- * @author :WuZeYu
- * @Date :2024/5/21 15:34
- * @LastEditTime :2024/5/21 15:34
- * @Description
- */
-/**
- * 杞亴缁勮〃
+ * @author ZhuBaoMin
+ * @date 2025-03-18 11:21
+ * @LastEditTime 2025-03-18 11:21
+ * @Description 杞亴缁勫疄浣撶被
*/
@TableName(value="ir_irrigate_group", autoResultMap = true)
@@ -29,56 +25,45 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "杞亴缁勫疄浣�")
public class IrIrrigateGroup implements BaseEntity {
-
- public static final long serialVersionUID = 202405211534001L;
+ public static final long serialVersionUID = 202503181126001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
/**
- * 杞亴缁勭紪鐮�
- */
- @Schema(description = "杞亴缁勭紪鐮�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "杞亴缁勭紪鐮佷笉鑳戒负绌�")
+ * 杞亴缁勫悕绉�
+ */
+ @NotBlank(message = "杞亴缁勫悕绉颁笉鑳戒负绌�")
private String groupCode;
/**
- * 椤圭洰ID
- */
- @Schema(description = "椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "椤圭洰ID涓嶈兘涓虹┖")
- private Long projectId;
+ * 榛樿鐏屾簤鏃堕暱;绮剧‘鍒板垎閽�
+ */
+ private Integer defaultDuration;
/**
- * 澶囨敞
- */
- @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 澶囨敞淇℃伅
+ */
private String remarks;
/**
- * 鎿嶄綔浜篒D
- */
- @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
+ * 鎿嶄綔浜�
+ */
private Long operator;
/**
- * 鎿嶄綔鏃堕棿
- */
- @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Date operateDt;
-
+ * 鎿嶄綔鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date operateTime;
/**
- * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
- */
- @Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
+ */
private Byte deleted;
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0