gx

@@ -31,20 +31,11 @@ class UserLogic extends BaseLogic
         //密码加密
         $this->param['password'] = base64_encode(md5($this->param['password']));
         //上传头像
-<<<<<<< HEAD
-<<<<<<< HEAD
-        $rs = $this->model->add($param);
-=======
-        $data = $this->upload();
-        $this->param['image'] = $data['path'];
-=======
         if(isset($this->param['image'])){
             $data = $this->upload();
             $this->param['image'] = $data['path'];
         }
->>>>>>> 3b461e8f6b3728aaecd000b788883b3821a11fad
         $rs = $this->model->add($this->param);
->>>>>>> 035a3ec52f37cac95246eaab50090ce3f6c67bb2
         if($rs === false){
             $this->fail('error',Code::USER_ERROR);
         }