Merge branch 'cyy_mr' into 'master'

* Modify mr review log. See merge request easycorp/zentaopms!4602
2022-07-20 01:45:46 +00:00
parent c904507658 3de9a41c2b
commit 895f8136ec
1 changed files with 1 additions and 1 deletions
@@ -1201,7 +1201,7 @@ class mrModel extends model
    public function approve($MR, $action = 'approve', $comment = '')
    {
        $this->loadModel('action');
-        $actionID = $this->action->create('mr', $MR->id, $action);
+        $actionID = $this->action->create('mrapproval', $MR->id, $action);

        $oldMR = $MR;
        if(isset($MR->status) and $MR->status == 'opened')