Merge branch 'web_sannong_fr'

app/JsonRpc/WebsiteService.php

@@ -664,7 +664,7 @@ class WebsiteService implements WebsiteServiceInterface
             'type' => $data['type'] 
         ]; 
         $num=$data['num'];
-        $result=Link::where($where)->orderBy('id')->limit($num)->get(); 
+        $result=Link::where($where)->orderBy('sort')->limit($num)->get(); 
         if(!empty($result)){ 
             return Result::success($result);  
         }else{