。

app/Admin/Controllers/HomeController.php

@@ -75,11 +75,7 @@ class HomeController extends Controller
             ->description('欢迎回到懒族后台')
             ->body(function (Row $row) {
                 $row->column(3, function (Column $column) {
-<<<<<<< .mine
                     $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MM));
-=======
-                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id, 2));
->>>>>>> .theirs
                 });
 
                 $row->column(3, function (Column $column) {