Merge branch 'wuye-d'

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -87,7 +87,7 @@ class MasterWorkerLogic extends BaseLogic
     {
         if($params['category_ids']){
             foreach ($params['category_ids'] as $val){
-                $ids[] = end($val);
+                is_array($val)?($ids[] = end($val)):($ids[] = $val);
             }
             //$params['category_ids'] = ["goods_category_ids"=>$params['category_ids'],"ids"=>$ids];
             $params['category_ids'] = implode(',',$ids);