diff --git a/application/admin/controller/salary/CustomDetail.php b/application/admin/controller/salary/CustomDetail.php index a93b948..ddad4b7 100644 --- a/application/admin/controller/salary/CustomDetail.php +++ b/application/admin/controller/salary/CustomDetail.php @@ -233,7 +233,7 @@ class CustomDetail extends Backend } - public function edit() + public function edit($ids = null) { if (false === $this->request->isPost()) { diff --git a/public/assets/js/backend/salary/custom_detail.js b/public/assets/js/backend/salary/custom_detail.js index 0cc7872..869dbb7 100644 --- a/public/assets/js/backend/salary/custom_detail.js +++ b/public/assets/js/backend/salary/custom_detail.js @@ -45,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin table: table, buttons: [ { - name: 'edit', + name: 'myedit', text: '编辑', title: '编辑', classname: 'btn btn-xs btn-success btn-dialog',