合并冲突

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

@@ -119,9 +119,6 @@ public class CellStylePane extends AbstractCellAttrPane {
                     elementCase.addCellElement(cellElement);
                 }
                 Style style = stylePane.updateBean();
-                if (style == null) {
-                    style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
-                }
                 cellElement.setStyle(style);
             }
         });