diff --git a/ConflictTest2.java b/ConflictTest2.java index 9b23f3c74a6a564adf8db857e226bc85d669227c..c2e9dce3e97f711c7ae37800fd3a1fb5ae59c9f2 100644 --- a/ConflictTest2.java +++ b/ConflictTest2.java @@ -22,6 +22,6 @@ public class ConflictTest2 { */ public static int add(int a, int b) { // todo 这里有一个Bug需要修复 - return a - b; + return a * b; } }