Merge remote-tracking branch 'origin/dev' into dev

a54552239 · a54552239 · commit 0096371a4706 · 2020-05-09T21:15:56.000+08:00
diff --git a/.env.example b/.env.example
@@ -1,5 +1,5 @@
 [app]
-app_name = false
+app_name = PearProject
 app_version = 2.8.15
 app_host = ''
 app_debug = false
diff --git a/application/project/controller/Project.php b/application/project/controller/Project.php
@@ -93,7 +93,7 @@ public function index()
                 $newList[] = $item;
             }
         }
-        $this->success('', ['list' => $newList, 'total' => count($newList)]);
+        $this->success('', ['list' => $newList, 'total' => $list['total']]);
     }
 
     public function analysis(Request $request)

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function index()`
`93`	`93`	`$newList[] = $item;`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`- $this->success('', ['list' => $newList, 'total' => count($newList)]);`
	`96`	`+ $this->success('', ['list' => $newList, 'total' => $list['total']]);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public function analysis(Request $request)`