Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -54,7 +54,7 @@ class KeywordLogic extends  BaseLogic
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $this->param['id'], $this->user['project_id']);
                 $id = $this->editCategoryRoute($this->param['id'],$route);
-                $this->model->edit($this->param,['id'=>$this->param['id']]);
+                $this->model->edit($this->param,['id'=>$id]);
             }else{
                 $this->param['project_id'] = $this->user['project_id'];
                 $this->param['created_at'] = date('Y-m-d H:i:s');