Merge branch 'cygx_12.0' into debug

models/user.go

@@ -44,7 +44,7 @@ func GetUserDetailByUserId(userId int) (item *UserDetail, err error) {
 	( SELECT COUNT( 1 ) AS count FROM	cygx_my_schedule AS a INNER JOIN cygx_activity AS art ON art.activity_id = a.activity_id WHERE
 		a.user_id = ? AND art.publish_status = 1 AND art.active_state != 3 ) AS schedule_num
 	FROM wx_user WHERE user_id = ? `
-	err = o.Raw(sql, userId, userId, userId, userId).QueryRow(&item)
+	err = o.Raw(sql, userId, userId, userId, userId, userId).QueryRow(&item)
 	return
 }