Merge branch 'collector_1106_fr'

app/JsonRpc/CollectorService.php

@@ -805,7 +805,7 @@ class CollectorService implements CollectorServiceInterface
                     //查询未导入的文章id
                     $art_catid = Article::whereIn('id',$info)->whereNull('catid')->count();
                     if($art_catid>0){
-                        $catid = (int)$data['catid'];
+                        $catid = (int)$catid['catid'];
                         $cat_arr_id = json_encode([$catid]);
                         $result = Article::whereIn('id',$info)->update(['catid'=>$catid['catid'],'cat_arr_id'=>$cat_arr_id]);
                     }else{