* Merge 18.4 into master.

This commit is contained in:
hufangzhou
2023-05-05 09:26:04 +08:00
224 changed files with 3115 additions and 1654 deletions
+1 -1
View File
@@ -877,7 +877,7 @@ class task extends control
$story = $this->story->getById($task->story, $task->storyVersion);
$task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec);
$task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify);
$task->storyFiles = $this->loadModel('file')->getByObject('story', $task->story);
$task->storyFiles = zget($story, 'files', array());
}
if($task->team) $this->lang->task->assign = $this->lang->task->transfer;