Merge remote-tracking branch 'origin/develop' into develop

application/adminapi/controller/Tasks.php

@@ -121,5 +121,12 @@ class Tasks extends adminApi
         }
     }
 
+    /*
+    * 任务类型列表
+    */
+    public function task_type_list(){
+        $list = model('api/Tasks')->task_type;
+        return V(1,"成功", $list);
+    }
 
 }