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/Patrol.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 81da056..b9a4aa3 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -5,10 +5,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
import java.io.Serializable;
@Data
@@ -16,6 +13,7 @@
@Table(name = "d_patrol")
@TableName("d_patrol")
@EqualsAndHashCode(callSuper = false)
+@IdClass(PatrolKey.class)
public class Patrol extends BizBaseEntity implements Serializable {
/**
@@ -28,15 +26,26 @@
@TableField("id")
private String id;
+ @Id
+ @Column(name = "user_id", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉璐﹀彿'")
+ @TableField("user_id")
+ private String userId;
+
+ @Id
+ @Column(name = "conf_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableField("conf_id")
+ private String confId;
+
+ @Column(name = "conf_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+ @TableField("conf_name")
+ private String confName;
+
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
private String deptId;
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableField("batch_id")
- private String batchId;
-
@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
@TableField("user_name")
private String userName;
+
}
--
Gitblit v1.9.3