Merge branch 'master' into develop

app/Api/Controllers/PharmacyController.php

@@ -26,7 +26,7 @@ public function PharmacyList(Request $request)
         $search_input = $request->input('search_input');
         $search_input = $request->input('search_input');
         $lat = $request->input('lat');
         $lat = $request->input('lat');
         $lng = $request->input('lng');
         $lng = $request->input('lng');
-        $distance = $request->input('distance_sort', 0); // 经纬度排序规则[0=从近到远,1=从远到近]
+        $distance_sort = $request->input('distance_sort', 0); // 经纬度排序规则[0=从近到远,1=从远到近]
         $query = PharmacyModel::query();
         $query = PharmacyModel::query();
         if ($search_input) {
         if ($search_input) {
             $query->where('name', 'like', "%{$search_input}%");
             $query->where('name', 'like', "%{$search_input}%");