fixed conflict

2020-12-28 18:36:00 +08:00
parent 2c94b69319
commit 52e91a2050
6 changed files with 615 additions and 0 deletions
@@ -251,4 +251,6 @@ class TebusController extends Controller
        
        return response()->json($tebus);
    }
+
+    
 }