* merge after 12.4.1 changes.

This commit is contained in:
z
2020-08-31 15:31:55 +08:00
parent ba32604be6
commit a9df6f3b9c
55 changed files with 364 additions and 146 deletions
+1 -1
View File
@@ -622,7 +622,7 @@ class task extends control
}
else
{
$story = $this->story->getById($task->story);
$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);