Merge remote-tracking branch 'origin/release-20.0'

2024-04-23 17:12:24 +08:00
parent 63d51564de 8856db689c
commit bced2b76b4
191 changed files with 1353 additions and 866 deletions
@@ -196,6 +196,7 @@ class mr extends control
        {
            $MR = form::data($this->config->mr->form->create)
                ->setIF($this->post->needCI == 0, 'jobID', 0)
+                ->add('createdBy', $this->app->user->account)
                ->get();
            $result = $this->mr->create($MR);
            return $this->send($result);
@@ -260,6 +261,7 @@ class mr extends control
        {
            $MR = form::data($this->config->mr->form->edit)
                ->setIF($this->post->needCI == 0, 'jobID', 0)
+                ->add('editedBy', $this->app->user->account)
                ->get();
            $result = $this->mr->update($MRID, $MR);
            return $this->send($result);