From 0f9936a5428f11e25cdc9f1e7222fa187e1607bc Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 31 五月 2024 11:27:28 +0800 Subject: [PATCH] update 更改 工作流 测试用例接口路径 --- ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java index bbdaaa1..6b9211b 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java @@ -21,4 +21,9 @@ */ int index() default -1; + /** + * 鍚堝苟闇�瑕佷緷璧栫殑鍏朵粬瀛楁鍚嶇О + */ + String[] mergeBy() default {}; + } -- Gitblit v1.9.3