Merge branch '185'

2022-02-28 08:58:20 +08:00
parent 7ad985200f f3f91716c6
commit df55b0af1b
505 changed files with 19184 additions and 2533 deletions
@@ -462,7 +462,7 @@ class weeklyModel extends model
        $executions      = $this->loadModel('execution')->getList($project, 'all', 'all', 0, 0, 0);
        $executionIdList = array_keys($executions);

-        if(isset($this->config->proVersion))
+        if($this->config->edition == 'max')
        {
            $AC = $this->dao->select('sum(consumed) as consumed')
                ->from(TABLE_EFFORT)