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

2020-05-09 21:15:56 +08:00 · 2020-05-09 21:15:56 +08:00 · 0096371a47
commit 0096371a47
parent 54621ee79c a8b2f3a92e
2 changed files with 2 additions and 2 deletions
--- 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
--- a/application/project/controller/Project.php
+++ b/application/project/controller/Project.php
@ -93,7 +93,7 @@ class Project extends BasicApi
                $newList[] = $item;
            }
        }
-        $this->success('', ['list' => $newList, 'total' => count($newList)]);
+        $this->success('', ['list' => $newList, 'total' => $list['total']]);
    }

    public function analysis(Request $request)