Authored by xiaofeng.yao@yoho.cn

Merge branch 'release'

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