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/domain/GenTable.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java index 944fd2e..f792ceb 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java @@ -32,6 +32,12 @@ private Long tableId; /** + * 鏁版嵁婧愬悕绉� + */ + @NotBlank(message = "鏁版嵁婧愬悕绉颁笉鑳戒负绌�") + private String dataName; + + /** * 琛ㄥ悕绉� */ @NotBlank(message = "琛ㄥ悕绉颁笉鑳戒负绌�") -- Gitblit v1.9.3