Merge branch 'develop' into feature/app_dev

go/gopath/src/fohow.com/apps/models/live_model/live_broad.go

@@ -30,6 +30,7 @@ type LiveBroad struct {
 	DateFomat      int       `orm:"-"                                             json:"date"`                        // varchar(255)
 	HourFomat      string    `orm:"-"                                             json:"begin_hour"`                  // varchar(255)
 	EndHourFomat   string    `orm:"-"                                             json:"end_hour"`                    // varchar(255)
+	RankStrs       string    `orm:"column(rank_strs);null"              json:"rank_strs"`                             // int(11)
 	CreatedAt      time.Time `orm:"column(created_at);null;auto_now_add;type(datetime)"  json:"created_at,omitempty"` // datetime
 	UpdatedAt      time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"      json:"updated_at,omitempty"` // datetime
 }

go/gopath/src/fohow.com/apps/models/user_model/wx_user.go

@@ -62,8 +62,7 @@ type WxUser struct {
 	Depart       int64   `orm:"column(depart)" json:"-"`                                // datetime
 
 	//等级
-	Rank     int64  `orm:"column(rank);null"              json:"rank"`           // int
-	RankStrs string `orm:"column(rank_strs);null"              json:"rank_strs"` // int(11)
+	Rank int64 `orm:"column(rank);null"              json:"rank"` // int
 
 	PartnerTime int64     `orm:"column(partner_time);null"              json:"-"` // 群主时间
 	UserNo      string    `orm:"column(user_no);null"              json:"-"`      // int(11)