From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:52:19 +0800
Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容

---
 ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
index 51d3e23..2a2fb82 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
@@ -43,7 +43,7 @@
      * 鏌ヨ鎹簱鍒楄〃
      *
      * @param tableNames 琛ㄥ悕绉扮粍
-     * @param dataName
+     * @param dataName   鏁版嵁婧愬悕绉�
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
     List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName);
@@ -67,7 +67,6 @@
      * 淇敼涓氬姟
      *
      * @param genTable 涓氬姟淇℃伅
-     * @return 缁撴灉
      */
     void updateGenTable(GenTable genTable);
 
@@ -75,7 +74,6 @@
      * 鍒犻櫎涓氬姟淇℃伅
      *
      * @param tableIds 闇�瑕佸垹闄ょ殑琛ㄦ暟鎹甀D
-     * @return 缁撴灉
      */
     void deleteGenTableByIds(Long[] tableIds);
 
@@ -83,7 +81,7 @@
      * 瀵煎叆琛ㄧ粨鏋�
      *
      * @param tableList 瀵煎叆琛ㄥ垪琛�
-     * @param dataName
+     * @param dataName  鏁版嵁婧愬悕绉�
      */
     void importGenTable(List<GenTable> tableList, String dataName);
 
@@ -107,7 +105,6 @@
      * 鐢熸垚浠g爜锛堣嚜瀹氫箟璺緞锛�
      *
      * @param tableId 琛ㄥ悕绉�
-     * @return 鏁版嵁
      */
     void generatorCode(Long tableId);
 

--
Gitblit v1.9.3