mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vilson 2020-05-09 21:15:56 +08:00
commit 0096371a47
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -1,5 +1,5 @@
[app] [app]
app_name = false app_name = PearProject
app_version = 2.8.15 app_version = 2.8.15
app_host = '' app_host = ''
app_debug = false app_debug = false

2
application/project/controller/Project.php
View File

@ -93,7 +93,7 @@ class Project extends BasicApi
$newList[] = $item; $newList[] = $item;
} }
} }
$this->success('', ['list' => $newList, 'total' => count($newList)]); $this->success('', ['list' => $newList, 'total' => $list['total']]);
} }
public function analysis(Request $request) public function analysis(Request $request)