周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 79a01e33f775883893c9f616c2822bbcbcc5103a 1 个父辈 6e58fc1c

gx

内嵌 并排对比
正在显示 1 个修改的文件 包含 0 行增加 和 28 行删除
@@ -21,18 +21,11 @@ class AiCommandLogic extends BaseLogic @@ -21,18 +21,11 @@ class AiCommandLogic extends BaseLogic
21 * @author :liyuhang 21 * @author :liyuhang
22 * @method 22 * @method
23 */ 23 */
24 -<<<<<<< HEAD  
25 - public function info(){  
26 -=======  
27 public function ai_info(){ 24 public function ai_info(){
28 -<<<<<<< HEAD  
29 ->>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4  
30 -=======  
31 $info = $this->model->read($this->param); 25 $info = $this->model->read($this->param);
32 if($info !== false){ 26 if($info !== false){
33 $this->fail('当前数据不存在'); 27 $this->fail('当前数据不存在');
34 } 28 }
35 ->>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0  
36 return $this->success(); 29 return $this->success();
37 } 30 }
38 31
@@ -42,13 +35,7 @@ class AiCommandLogic extends BaseLogic @@ -42,13 +35,7 @@ class AiCommandLogic extends BaseLogic
42 * @author :liyuhang 35 * @author :liyuhang
43 * @method 36 * @method
44 */ 37 */
45 -<<<<<<< HEAD  
46 - public function add(){  
47 -=======  
48 public function ai_add(){ 38 public function ai_add(){
49 -<<<<<<< HEAD  
50 ->>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4  
51 -=======  
52 $condition = [ 39 $condition = [
53 'key'=>$this->param['key'] 40 'key'=>$this->param['key']
54 ]; 41 ];
@@ -60,7 +47,6 @@ class AiCommandLogic extends BaseLogic @@ -60,7 +47,6 @@ class AiCommandLogic extends BaseLogic
60 if($rs === false){ 47 if($rs === false){
61 $this->fail('error'); 48 $this->fail('error');
62 } 49 }
63 ->>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0  
64 return $this->success(); 50 return $this->success();
65 } 51 }
66 52
@@ -70,13 +56,7 @@ class AiCommandLogic extends BaseLogic @@ -70,13 +56,7 @@ class AiCommandLogic extends BaseLogic
70 * @author :liyuhang 56 * @author :liyuhang
71 * @method 57 * @method
72 */ 58 */
73 -<<<<<<< HEAD  
74 - public function edit(){  
75 -=======  
76 public function ai_edit(){ 59 public function ai_edit(){
77 -<<<<<<< HEAD  
78 ->>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4  
79 -=======  
80 $condition = [ 60 $condition = [
81 'id'=>['!=',$this->param['id']], 61 'id'=>['!=',$this->param['id']],
82 'key'=>$this->param['key'] 62 'key'=>$this->param['key']
@@ -89,7 +69,6 @@ class AiCommandLogic extends BaseLogic @@ -89,7 +69,6 @@ class AiCommandLogic extends BaseLogic
89 if($rs === false){ 69 if($rs === false){
90 $this->fail('error'); 70 $this->fail('error');
91 } 71 }
92 ->>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0  
93 return $this->success(); 72 return $this->success();
94 } 73 }
95 74
@@ -99,19 +78,12 @@ class AiCommandLogic extends BaseLogic @@ -99,19 +78,12 @@ class AiCommandLogic extends BaseLogic
99 * @author :liyuhang 78 * @author :liyuhang
100 * @method 79 * @method
101 */ 80 */
102 -<<<<<<< HEAD  
103 - public function del(){  
104 -=======  
105 public function ai_del(){ 81 public function ai_del(){
106 -<<<<<<< HEAD  
107 ->>>>>>> 0a33166a03a36ebcf1c74fe78d1a9a2080e1c6d4  
108 -=======  
109 $this->param['id'] = ['in',$this->param['id']]; 82 $this->param['id'] = ['in',$this->param['id']];
110 $rs = $this->model->del($this->param); 83 $rs = $this->model->del($this->param);
111 if($rs === false){ 84 if($rs === false){
112 $this->fail('error'); 85 $this->fail('error');
113 } 86 }
114 ->>>>>>> 6732faf6504ff84e7d22309bfc7c7de49f0432c0  
115 return $this->success(); 87 return $this->success();
116 } 88 }
117 } 89 }