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

app/Console/Commands/ExcellentResidents.php

@@ -120,7 +120,7 @@ class ExcellentResidents extends Command
         $collent = $this->_condition($this->generalRecord, $virus_id->virus_behavior_id);
         $collent = $collent->toArray();
         foreach ($collent as $k => $v) {
-            $collent[$k]['type'] = 'collent';
+            $collent[$k]['type'] = 'collect';
         }
 
         //文章被喜欢最多用户