Merge branch 'master' of https://git.yidian-inc.com:8021/bp/goods

application/services/marketing/TakePlaceService.php

@@ -145,7 +145,9 @@ class TakePlaceService
             ];
         }
         $where['ORDER'] = ['marketing_take_place_id' => 'DESC'];
-        $where['LIMIT'] = [$offset, $limit];
+
+        // 如果分页后排序，排序就会有问题，自提点数量有限也不用分页处理。
+//        $where['LIMIT'] = [$offset, $limit];
 
         $relations = MarketingTakePlace::select('*', $where);
         if(empty($relations)) {