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

This commit is contained in:
2025-10-29 17:57:36 +08:00

View File

@@ -386,6 +386,12 @@ class Room extends adminApi
public function edit_relation(){
$relation_id = input('relation_id', '');
$name = input('name', '');
if($relation_id == 0){
if($name != '无'){
return V(0,'此关系不允许修改');
}
}
$type = input('type', '');
$is_open_movie = input('is_open_movie', 1);
$icon = input('icon', '');