From ac8660d2dd439e8074c1760cbe6cc9465a452193 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:50:17 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/Function/Scene.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 2fd46a9..04888ab 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -151,6 +151,7 @@
/// 閰嶅悎璞嗚眴淇敼浜戠鏁版嵁
/// 璋冭瘯瀹濄�乷n pro鍜屽钩鍙板搴�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<SceneImageInfo> OssSceneImages = new List<SceneImageInfo>()
{
new SceneImageInfo
@@ -726,7 +727,7 @@
{
case FunctionAttributeKey.SetTemp:
case FunctionAttributeKey.RoomTemp:
- us = "掳";
+ us = "掳C";
break;
case FunctionAttributeKey.Percent:
case FunctionAttributeKey.Brightness:
--
Gitblit v1.8.0