Merge branch 'dev' of shop/php into master

app/controller/api/Auth.php

@@ -405,7 +405,7 @@ class Auth extends BaseController
         $type = $this->request->param('type',1);
 //        $where['mer_id']=$this->merId;
         $where['type']=$type;
-        $data=Db::name('enterprise_agreement')->where($where)->find();
+        $data=Db::name('user_agreement')->where($where)->find();
         if(!$data){
             $data['title']='';
             $data['content']='';