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

app/Console/Commands/DemandTimeout.php

@@ -40,10 +40,10 @@ class DemandTimeout extends Command
      */
     public function handle()
     {
-    	Log::info('定时任务');
-    	//Demand::query()
-		//	->where('deadline','<=' ,now())
-		//	->where('status',DemandTraits::$stateKey[0])
-		//	->update(['status' => DemandTraits::$stateKey[2]]);
+    	//Log::info('定时任务');
+    	Demand::query()
+			->where('deadline','<=' ,now())
+			->where('status',DemandTraits::$stateKey[0])
+			->update(['status' => DemandTraits::$stateKey[2]]);
     }
 }