Authored by xiaofeng.yao@yoho.cn

Merge branch 'release'

... ... @@ -37,9 +37,9 @@ class Room extends \yii\db\ActiveRecord
public function rules()
{
return [
[['room_id', 'master_id', 'starting_time', 'best', 'vest', 'living', 'status', 'create_time', 'update_time'], 'integer'],
[['room_id', 'master_id', 'app', 'starting_time', 'best', 'vest', 'living', 'status', 'create_time', 'update_time'], 'integer'],
[['title', 'watermark'], 'string', 'max' => 100],
[['app', 'secret'], 'string', 'max' => 50],
[['secret'], 'string', 'max' => 50],
[['pic'], 'string', 'max' => 255],
[['room_id'], 'unique'],
[['secret'], 'unique'],
... ...