Merge branch 'dev' of wugg/useraccount into master

app/controller/User.php

@@ -173,7 +173,8 @@ class User extends Base
         	"company_relaton"=>$acc->company_relaton,
         	];
        
-        if($post['openId']!=''&& $acc->userinfo->openId!=$post['openId'] ){
+        if($post['openId']!=''){
+   	        if($acc->userinfo->openId!='')$this->error('账户信息已绑定微信请先解除',1004);
 	        $acc->userinfo->openId=$post['openId'];
 	        $this->model->userinfo()->save($acc->userinfo->toArray());
         }