From 036a6d241cf1cfc0345ddf28e748a3d6deda08df Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 15 十二月 2025 20:35:09 +0800
Subject: [PATCH] 新增出入库审批页面

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java |   46 ++++++++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index 2344a0b..2cab1b3 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -1,8 +1,9 @@
 package com.fzzy.igds.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,11 +14,6 @@
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- * @Description 鐢靛瓙宸¢�婚厤缃�
- * @Author sgj
- * @Date 2025/12/04 11:38
- */
 @Data
 @Entity
 @Table(name = "d_patrol_conf")
@@ -31,23 +27,33 @@
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
-    @TableField("batch_id")
-    private String batchId;
+    @Column(name = "id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+    @TableId(value = "id", type = IdType.NONE)
+    @TableField("id")
+    private String id;
 
-    @Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
-    @TableField("batch_name")
-    private String batchName;
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Column(name = "start_time", columnDefinition = "datetime COMMENT '宸¢�诲紑濮嬫椂闂�'")
-    @TableField("start_time")
-    private Date startTime;
+    @Column(name = "name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+    @TableField("name")
+    private String name;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Column(name = "end_time", columnDefinition = "datetime COMMENT '宸¢�荤粨鏉熸椂闂�'")
-    @TableField("end_time")
-    private Date endTime;
+    @Column(name = "user_id", columnDefinition = "varchar(200) COMMENT '宸¢�讳汉璐﹀彿'")
+    @TableField("user_id")
+    private String userId;
 
+    @Column(name = "user_name", columnDefinition = "varchar(200) COMMENT '宸¢�讳汉'")
+    @TableField("user_name")
+    private String userName;
+
+    @Column(name = "start", columnDefinition = "datetime COMMENT '璧峰鏃堕棿'")
+    @TableField("start")
+    private Date start;
+
+    @Column(name = "end", columnDefinition = "datetime COMMENT '鎴鏃堕棿'")
+    @TableField("end")
+    private Date end;
 
 }

--
Gitblit v1.9.3