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

application/api/model/DailyTasks.php

@@ -87,7 +87,7 @@ class DailyTasks extends Model
         $reslut['tasks']['usual_tasks'] = [];//平台常规任务3
 //        $reslut['tasks']['teacher_tasks'] = [];//师徒任务4
         $data = db::name('vs_daily_tasks')
-            ->field('task_id,icon,task_name,gold_reward,target_quantity,task_type')
+            ->field('task_id,icon,task_name,gold_reward,target_quantity,task_type,reward_type')
             ->where('delete_time',0)
             ->where('is_active',1)
             ->order('sort asc')->select();