Pull request #6559: 无JIRA任务 解决冲突

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit '843b118cce801a3300c0598768ab2dda7c29772e':
  REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化

designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java

@@ -31,6 +31,7 @@ public class DesignerToastMsgUtil {
 
     }
 
+
     public static void toastPrompt(JPanel contendPane) {
         toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame());
     }
@@ -117,4 +118,4 @@ public class DesignerToastMsgUtil {
                 .toString();
     }
 
-}
+}

designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

@@ -159,4 +159,5 @@ public class ToastMsgDialog extends UIDialog {
         super.dispose();
     }
 
-}
+
+}