From 7e0889b3c0f2a3880800b47807a7db49c11ebbaf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 15 七月 2025 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'

---
 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 58cdddb..8ede335 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,6 +1,7 @@
 package com.ruoyi.approve.pojo;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.*;
@@ -13,7 +14,7 @@
  */
 @Data
 @TableName("approve_process")
-public class ApproveProcess implements Serializable {
+public class ApproveProcess{
     /**
      * 
      */
@@ -21,7 +22,7 @@
     private Long id;
 
     /**
-     * 瀹℃壒id
+     * 娴佺▼缂栧彿
      */
     private String approveId;
 
@@ -29,6 +30,11 @@
      * 鐢宠浜篿d
      */
     private Long approveUser;
+
+    /**
+     * 鐢宠浜哄悕绉�
+     */
+    private String approveUserName;
 
     /**
      * 鐢宠閮ㄩ棬id
@@ -41,12 +47,12 @@
     private String approveDeptName;
 
     /**
-     * 鐢宠鐢ㄦ埛ids
+     * 瀹℃壒鐢ㄦ埛ids
      */
     private String approveUserIds;
 
     /**
-     * 鐢宠鐢ㄦ埛鍚嶇О
+     * 瀹℃壒鐢ㄦ埛鍚嶇О
      */
     private String approveUserNames;
 
@@ -54,6 +60,16 @@
      * 鐢宠鍘熷洜
      */
     private String approveReason;
+
+    /**
+     * 褰撳墠瀹℃壒鐢ㄦ埛ID
+     */
+    private Long approveUserCurrentId;
+
+    /**
+     * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
+     */
+    private String approveUserCurrentName;
 
     /**
      * 鐢宠鏃ユ湡
@@ -68,7 +84,7 @@
     private Date approveOverTime;
 
     /**
-     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
      */
     private Integer approveStatus;
 
@@ -80,7 +96,7 @@
     /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
@@ -93,6 +109,11 @@
      */
     private String approveRemark;
 
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private LocalDateTime createTime;
+
     private static final long serialVersionUID = 1L;
 
 

--
Gitblit v1.9.3