Merge remote-tracking branch 'origin/develop' into develop

application/adminapi/controller/Room.php

@@ -1003,6 +1003,14 @@ class Room extends adminApi
         if($type_id == 9){
             $data['label_id'] = 6;
         }
+        $start_time = input('start_time', '');//营业开始时间
+        if($start_time){
+            $data['start_time'] = $start_time;
+        }
+        $end_time = input('end_time', '');//营业结束时间
+        if($end_time){
+            $data['end_time'] = $end_time;
+        }
         $data['updatetime'] = time();
         $res = db::name('vs_room')->where('id',$room_id)->update($data);
         if($res){