3

Calculator.java

@@ -1,16 +1,19 @@
+package Calculator;
 import java.util.Scanner;
 
 public class Calculator {
     public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
-        System.out.print("请输入要转换的数：");
-        String num = scanner.nextLine();
-
+<<<<<<< HEAD
+=======
         System.out.print("请输入源进制(2-16)：");
         int fromBase = scanner.nextInt();
-
         System.out.print("请输入目标进制(2-16)：");
         int toBase = scanner.nextInt();
+>>>>>>> origin/master
+        System.out.print("请输入要转换的数：");
+        String num = scanner.nextLine();
+
 
         // 调用转换方法
         String converted = convertBase(num, fromBase, toBase);
@@ -40,4 +43,4 @@ public class Calculator {
 
         return result.toString();
     }
-}
+}