From 1cfec44423cd033f17d473edfc2ce3a12a80ee24 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Mon, 14 Sep 2020 10:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/HomeController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php
index 1f3a831..6408127 100644
--- a/app/Admin/Controllers/HomeController.php
+++ b/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) {