Commit f1f02965 authored by yanzg's avatar yanzg

接口文档的支持

parent 2dcdf475
...@@ -46,6 +46,7 @@ public class ExcelMergerData { ...@@ -46,6 +46,7 @@ public class ExcelMergerData {
* @param nowCellData 新数据 * @param nowCellData 新数据
*/ */
public void updateMerger(int rowIndex, String nowCellData) { public void updateMerger(int rowIndex, String nowCellData) {
this.mergerFlag = false;
boolean isMergerSuccess = this.rowIndex == -1 || !StringHelper.compare(this.data, nowCellData); boolean isMergerSuccess = this.rowIndex == -1 || !StringHelper.compare(this.data, nowCellData);
if (isMergerSuccess) { if (isMergerSuccess) {
...@@ -75,9 +76,7 @@ public class ExcelMergerData { ...@@ -75,9 +76,7 @@ public class ExcelMergerData {
} }
public boolean isMergerFlag() { public boolean isMergerFlag() {
boolean ret = mergerFlag; return mergerFlag;
mergerFlag = false;
return ret;
} }
public int getRowIndexHistory() { public int getRowIndexHistory() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment