From 20cc8a6d6cf16e97e236a9839406d858861cce3c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 06 八月 2024 13:53:40 +0800
Subject: [PATCH] fix 修复 excel 基于其他字段 合并错误问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
index 00919f8..9c7b0d7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
@@ -31,10 +31,10 @@
private Long id;
/**
- * 琛ㄥ崟ID
+ * 琛ㄥ悕
*/
- @ExcelProperty(value = "琛ㄥ崟ID")
- private Long formId;
+ @ExcelProperty(value = "琛ㄥ悕")
+ private String tableName;
/**
* 娴佺▼瀹氫箟ID
@@ -48,6 +48,13 @@
@ExcelProperty(value = "娴佺▼KEY")
private String processKey;
+
+ /**
+ * 娴佺▼鐗堟湰
+ */
+ @ExcelProperty(value = "娴佺▼鐗堟湰")
+ private Integer version;
+
/**
* 澶囨敞
*/
--
Gitblit v1.9.3