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