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

@@ -21,11 +21,18 @@ class AiCommandLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
+<<<<<<< HEAD
+    public function info(){
+=======
     public function ai_info(){
     public function ai_info(){
+<<<<<<< HEAD
+>>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4
+=======
         $info = $this->model->read($this->param);
         $info = $this->model->read($this->param);
         if($info !== false){
         if($info !== false){
             $this->fail('当前数据不存在');
             $this->fail('当前数据不存在');
         }
         }
+>>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -35,7 +42,13 @@ class AiCommandLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
+<<<<<<< HEAD
+    public function add(){
+=======
     public function ai_add(){
     public function ai_add(){
+<<<<<<< HEAD
+>>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4
+=======
         $condition = [
         $condition = [
             'key'=>$this->param['key']
             'key'=>$this->param['key']
         ];
         ];
@@ -47,6 +60,7 @@ class AiCommandLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+>>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -56,7 +70,13 @@ class AiCommandLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
+<<<<<<< HEAD
+    public function edit(){
+=======
     public function ai_edit(){
     public function ai_edit(){
+<<<<<<< HEAD
+>>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4
+=======
         $condition = [
         $condition = [
             'id'=>['!=',$this->param['id']],
             'id'=>['!=',$this->param['id']],
             'key'=>$this->param['key']
             'key'=>$this->param['key']
@@ -69,6 +89,7 @@ class AiCommandLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+>>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -78,12 +99,19 @@ class AiCommandLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
+<<<<<<< HEAD
+    public function del(){
+=======
     public function ai_del(){
     public function ai_del(){
+<<<<<<< HEAD
+>>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4
+=======
         $this->param['id'] = ['in',$this->param['id']];
         $this->param['id'] = ['in',$this->param['id']];
         $rs = $this->model->del($this->param);
         $rs = $this->model->del($this->param);
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
+>>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0
         return $this->success();
         return $this->success();
     }
     }
 }
 }