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

---
 .gitignore |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c0e049..fa3ee97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,13 @@
 *.iml
 *.ipr
 
+### JRebel ###
+rebel.xml
+
 ### NetBeans ###
 nbproject/private/
 build/*
 nbbuild/
-dist/
 nbdist/
 .nb-gradle/
 
@@ -42,3 +44,5 @@
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+
+.flattened-pom.xml

--
Gitblit v1.9.3