From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java b/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
index a3ae618..b6a0d8b 100644
--- a/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
+++ b/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,14 +17,17 @@
/**
* 绋嬪簭鍚�
*/
+ @Excel(name = "绋嬪簭鍚�")
private String programName;
/**
* 绋嬪簭鎻忚堪
*/
+ @Excel(name = "绋嬪簭鎻忚堪")
private String description;
/**
* 鐘舵��
*/
+ @Excel(name = "鐘舵��")
private String status;
/**
* 鍒涘缓鏃堕棿
@@ -58,4 +62,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3