Browse Source

Pull request #7305: NoJira 解决合并冲突

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '82613a5566b467ede02191dedadcd5fe242073ba':
  合并冲突
bugfix/11.0
zheng 3 years ago
parent
commit
9e60a27c9c
  1. 3
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

3
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);
}
});

Loading…
Cancel
Save