Pull request #16013: 无jira任务，解决冲突

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '188309b66bfbd67420eff48cacf3323e168d5178':
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接，去获取密钥等文件时，路径深的时候选择后路径有问题
  REPORT-145453 【fr-fbp】ssh和ssl的数据连接，去获取密钥等文件时，路径深的时候选择后路径有问题

designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java

@@ -67,6 +67,7 @@ public class SshPane extends BasicPane {
     private JPanel sshSettingPane;
     private SimpleCardPane verifyCardPane;
     private final UIButton fileChooserButton = new UIButton();
+
     private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH;
     private static final String USE_PASSWORD = "usePassword";
     private static final String USE_KEY = "useKey";