Accept Merge Request #100: (feature/zy -> develop)
Merge Request: feature: 按钮名称 Created By: @zhuyu Accepted By: @zhuyu URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/100
This commit is contained in:
commit
0f7cdc61a9
|
|
@ -154,7 +154,7 @@ class Detail extends Backend
|
||||||
return json($result);
|
return json($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assignconfig("manage", $this->auth->check('salary/custom_manage'));
|
$this->assignconfig("manage", $this->auth->check('salary/detail/custom_manage'));
|
||||||
$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();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user