Merge branch 'collector_1106_fr' into dev

app/JsonRpc/CollectorService.php

@@ -815,7 +815,7 @@ class CollectorService implements CollectorServiceInterface
                     if(isset($data['cat_arr_id'])){
                         $catid = isset($data['cat_arr_id'])?end($data['cat_arr_id']):'';
                         $cat_arr_id = isset($data['cat_arr_id'])?json_encode($data['cat_arr_id']):'';
-                        //若存在直接使用此导航id
+                        //若存在直接使用此导航id  
                        
                         $result = Article::whereIn('id',$info)->update(['catid'=>$catid,'cat_arr_id'=>$cat_arr_id]);
                         var_dump("55555555555555555",$result);
@@ -838,6 +838,7 @@ class CollectorService implements CollectorServiceInterface
             return  Result::success($result);
         }
         // return  Result::success($result);
+        // 123
 
     }