From f2d122dc78c58925a05d770d716e7fefcbd784ef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 11:09:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Entity/Function/Function.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
old mode 100644
new mode 100755
index ddafe50..cc7555b
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -235,7 +235,7 @@
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
- roomNameList = Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
--
Gitblit v1.8.0