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/IrProject.java | 100 +++++++++++++++++++++-----------------------------
1 files changed, 42 insertions(+), 58 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrProject.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrProject.java
index b6e9ae6..43bf84f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrProject.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrProject.java
@@ -6,23 +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 com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
-import org.hibernate.validator.constraints.Length;
import java.util.Date;
/**
- * @author :WuZeYu
- * @Date :2024/5/14 13:53
- * @LastEditTime :2024/5/14 13:53
- * @Description
- */
-
-/**
- * 椤圭洰琛�
+ * @author ZhuBaoMin
+ * @date 2025-03-18 10:57
+ * @LastEditTime 2025-03-18 10:57
+ * @Description 椤圭洰瀹炰綋绫�
*/
@TableName(value="ir_project", autoResultMap = true)
@@ -31,81 +25,71 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "椤圭洰瀹炰綋")
public class IrProject implements BaseEntity {
- public static final long serialVersionUID = 202405141427001L;
+ public static final long serialVersionUID = 202503181103001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@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 = "椤圭洰鍚嶇О涓嶈兘涓虹┖")
- @Length(message = "椤圭洰鍚嶇О涓嶅ぇ浜巤max}瀛�",max = 50)
private String projectName;
/**
- * 鐪両D
- */
- @Schema(description = "鐪両D", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 鐪両D
+ */
private Long provinceId;
+
/**
- * 甯侷D
- */
- @Schema(description = "甯侷D", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 甯侷D
+ */
private Long cityId;
+
/**
- * 鍘縄D
- */
- @Schema(description = "鍘縄D", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 鍘縄D
+ */
private Long countyId;
+
/**
- * 闀嘔D
- */
- @Schema(description = "闀嘔D", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 闀嘔D
+ */
private Long townId;
+
/**
- * 鏉慖D
- */
- @Schema(description = "鏉慖D", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 鏉慖D
+ */
private Long villageId;
-
-
/**
- * 椤圭洰鐘舵��;1-鍚姩锛�2-鍋滄
- */
- @Schema(description = "椤圭洰鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 椤圭洰鐘舵��;1-鍚敤锛�2-搴熷純
+ */
private Byte projectState;
/**
- * 鎿嶄綔浜篒D
- */
- @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Long operator;
-
- /**
- * 鎿嶄綔鏃堕棿
- */
- @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private Date operateDt;
-
- /**
- * 澶囨敞
- */
- @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.REQUIRED)
+ * 澶囨敞淇℃伅
+ */
private String remarks;
/**
- * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
- */
- @Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ * 鎿嶄綔浜�
+ */
+ private Long operator;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date operateTime;
+
+ /**
+ * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
+ */
private Byte deleted;
+
}
\ No newline at end of file
--
Gitblit v1.8.0