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

application/api/model/RoomHourRanking.php

@@ -115,6 +115,7 @@ class RoomHourRanking extends Model
                     ->field('a.id as room_id,a.room_name,a.label_id,a.room_cover,SUM(b.total_price) as total_price,c.label_icon')
                     ->where('a.type_id', '<>', 6)
                     ->where('a.id', $room_id)
+                    ->whereBetween('b.createtime', [$start_time, $end_time])
                     ->find();
 
                 if($profit[$k]) {