Merge branch 'master' into zentaopms_workflow

2019-07-24 09:14:23 +08:00
parent 6ef88595e1 65ca28c111
commit f858660ceb
383 changed files with 12033 additions and 2094 deletions
@@ -337,7 +337,7 @@ class testtask extends control
     * @access public
     * @return void
     */
-    public function report($productID, $taskID, $browseType, $branchID, $moduleID = 0, $chartType = '')
+    public function report($productID, $taskID, $browseType, $branchID, $moduleID = 0, $chartType = 'pie')
    {
        $this->loadModel('report');
        $this->view->charts = array();