无jira 解决冲突错误提交回退

3 years ago · aadc1a145a
1 changed files with 5 additions and 5 deletions
--- a/designer-base/src/main/java/com/fr/design/ui/compatible/ModernUIPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/ui/compatible/ModernUIPaneFactory.java
@ -11,10 +11,10 @@ import com.fr.stable.os.OperatingSystem;
 public class ModernUIPaneFactory {
    public static <T> ModernUIPane.Builder<T> modernUIPaneBuilder() {
-//        if (OperatingSystem.isWindows()) {
+        if (OperatingSystem.isWindows()) {
-//            return new NewModernUIPane.Builder<>();
+            return new NewModernUIPane.Builder<>();
-//        } else {
+        } else {
-//        }
+            return new ModernUIPane.Builder<>();
-        return new ModernUIPane.Builder<>();
+        }
    }
 }