hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #94: (feature/zy -> develop)

Browse Source 
Merge Request: feature: task notice

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/94
This commit is contained in:
zhuyu 2025-06-02 12:21:54 +08:00 committed by Coding
commit fc7a74455b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/controller/salary/Detail.php
View File

@ -151,11 +151,10 @@ class Detail extends Backend
$result = array("total" => count($res), "rows" => $res); $result = array("total" => count($res), "rows" => $res);
$this->assignconfig("manage", $this->auth->isSuperAdmin());
return json($result); return json($result);
} }
$this->assignconfig("manage", $this->auth->isSuperAdmin());
$this->view->assign("month", $month); $this->view->assign("month", $month);
$this->view->assign("salaryitem", json_encode($salaryItem)); $this->view->assign("salaryitem", json_encode($salaryItem));
return $this->view->fetch(); return $this->view->fetch();