From e327510c7329aa9a95e62a460ec659ea0c9563ad Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期六, 19 十二月 2020 19:05:47 +0800 Subject: [PATCH] Merge branch 'CJL' into NewFilePath --- HDL_ON/Entity/Function/Scene.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 4ac4da6..639997f 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -35,7 +35,7 @@ /// <summary> /// 浜戠鍞竴ID /// </summary> - public string userSceneId = ""; + public string userSceneId = null; /// <summary> /// 鍦烘櫙sid /// </summary> @@ -223,7 +223,7 @@ } if (roomNameList == "" ) { - roomNameList = Shared.Language.StringByID(StringId.WholeHouseScene); + roomNameList = Shared.Language.StringByID(StringId.WholeZone); } return roomNameList; } -- Gitblit v1.8.0