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

@@ -60,6 +60,12 @@ class CreateKeywordLogic extends BaseLogic
             if($info !== false){
                 $this->fail('当前名称已存在');
             }
+        }else{
+            $data['id'] = ['!=',$param['id']];
+            $info = $this->model->read($data);
+            if($info !== false){
+                $this->fail('当前名称已存在');
+            }
         }
         return $this->success($data);
     }