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/ApproveNode.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index afcf58f..300cc32 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -14,7 +15,8 @@
* @TableName approve_node
*/
@Data
-public class ApproveNode implements Serializable {
+@TableName("approve_node")
+public class ApproveNode{
/**
*
*/
@@ -54,13 +56,23 @@
@TableField(exist = false)
private Boolean isFirst;
+
+ /**
+ * 鏄惁涓烘渶鍚庝竴姝�
+ */
@TableField(exist = false)
private Boolean isLast;
/**
+ * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+ */
+ @TableField(exist = false)
+ private Boolean isShen = false;
+
+ /**
* 绉熸埛id
*/
- @TableField(fill = FieldFill.INSERT)
+// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
--
Gitblit v1.9.3