Merge branch 'kuaiyingyong' into liuzj-redis_queue-dev

# Conflicts:
#	config/queue.php

config/queue.php

@@ -69,7 +69,7 @@ return [
             'connection' => 'redis_queue_new',
             'queue' => 'default',
             'expire' => 60,
-        ]
+        ],
 
     ],