From f39631169d9cd1e0e29f5fc52cc1abd07ec0caee Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 19 Jan 2016 15:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=90=8E=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 2 +-
 app/models/user_wechat.rb             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 993007308..34dd2e79a 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -148,7 +148,7 @@ class WechatsController < ActionController::Base
        #补全用户信息
 
        uw = UserWechat.find_by_id(params[:openid])
-       uw.user = user
+       uw.user_id = user.id
        uw.save!
     rescue Exception=>e
       @wechat_bind_errors = e.message
diff --git a/app/models/user_wechat.rb b/app/models/user_wechat.rb
index 446655afd..49053dbf0 100644
--- a/app/models/user_wechat.rb
+++ b/app/models/user_wechat.rb
@@ -1,6 +1,6 @@
 class UserWechat < ActiveRecord::Base
   attr_accessible :subscribe, :openid, :nickname, :sex, :language, :city, :province, :country,
-                  :headimgurl, :subscribe_time, :unionid, :remark, :groupid, :user
+                  :headimgurl, :subscribe_time, :unionid, :remark, :groupid, :user, :user_id
 
   belongs_to :user
 end