Merge branch '180'

2022-01-04 22:41:23 +08:00
parent a2bd7cfcf3 44b222eca6
commit c8db935f34
84 changed files with 627 additions and 253 deletions
@@ -88,7 +88,7 @@ class programplan extends control

        if($type == 'lists')
        {
-            $sort  = $this->loadModel('common')->appendOrder($orderBy);
+            $sort  = common::appendOrder($orderBy);
            $this->loadModel('datatable');
            $plans = $this->programplan->getPlans($projectID, $this->productID, $sort);
        }