diff --git a/src/global/formula.js b/src/global/formula.js
index 9609910..cdb9d1d 100755
--- a/src/global/formula.js
+++ b/src/global/formula.js
@@ -1562,7 +1562,9 @@ const luckysheetformula = {
             cfg["rowlen"] = {};
         }
 
-        if ((d[r][c].tb == "2" && d[r][c].v != null) || isInlineStringCell(d[r][c])) {//自动换行
+        // 单元格行高自适应,只有在单元格不是合并单元格时才能生效
+        if ((d[r][c].tb == "2" && d[r][c].v != null) || isInlineStringCell(d[r][c]) && (typeof d[r][c]['mc'] == 'undefined')) {
+            //自动换行
             let defaultrowlen = Store.defaultrowlen;
 
             let canvas = $("#luckysheetTableContent").get(0).getContext("2d");