合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2578

@@ -243,7 +243,9 @@ class AsideTicketController extends BaseController
                 $ticket->plan_end_at = $request->input('plan_end_at');
                 $ticket->plan_end_at = $request->input('plan_end_at');
             if ($request->input('status'))
             if ($request->input('status'))
                 $ticket->status = $request->input('status');
                 $ticket->status = $request->input('status');
-
+            if ($request->input('num'))
+                $ticket->num = $request->input('num',0);
+            
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             {
             {
                 // 完成工单，把子任务里面未完成的工单改为完成
                 // 完成工单，把子任务里面未完成的工单改为完成