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 | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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 b6e96eb..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,23 +5,15 @@
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;
-
-/**
- * @Description 鐢靛瓙宸￠�昏褰曚富琛�
- * @Author sgj
- * @Date 2025/12/04 11:38
- */
@Data
@Entity
@Table(name = "d_patrol")
@TableName("d_patrol")
@EqualsAndHashCode(callSuper = false)
+@IdClass(PatrolKey.class)
public class Patrol extends BizBaseEntity implements Serializable {
/**
@@ -29,29 +21,31 @@
*/
private static final long serialVersionUID = 1L;
- //鐢熸垚瑙勫垯 骞存湀鏃�
@Id
@Column(name = "id", columnDefinition = "varchar(40) COMMENT '涓婚敭'")
@TableField("id")
private String id;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableField("batch_id")
- private String batchId;
-
- @Id
@Column(name = "user_id", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉璐﹀彿'")
@TableField("user_id")
private String userId;
- @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
- @TableField("user_name")
- private String userName;
+ @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 = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
+ @TableField("user_name")
+ private String userName;
}
--
Gitblit v1.9.3