Merge remote-tracking branch 'origin/master'

app/api/logic/LocalStoreLogic.php

@@ -33,7 +33,7 @@ class LocalStoreLogic extends Logic
 //        $sql = "SELECT *, ST_Distance_Sphere(POINT(".$data['longitude'].",".$data['latitude']."),POINT(longitude, latitude)) AS distance
 //                FROM ls_local_store where is_delete = 0 $s
 //                ORDER BY distance limit $page,$size";
-        $sql = "SELECT * FROM ls_local_store where is_delete = 0 and shopLogo is not null $s ORDER BY lstore_id asc limit $page,$size";
+        $sql = "SELECT * FROM ls_local_store where is_delete = 0 and shopLogo is not null $s ORDER BY lstore_id asc limit".$page.",".$size;
 //        var_dump($sql);
         $lists = Db::query($sql);
         foreach($lists as $key=>$value){