From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 98a240f..9bac1cb 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,15 +45,15 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 2,
}
/// <summary>
- /// 鍔熻兘绫诲埆
+ /// 鍔熻兘绫诲瀷
/// </summary>
public enum FunctionType
{
@@ -86,7 +86,7 @@
}
/// <summary>
- /// 鍔熻兘绫诲瀷
+ /// 鍔熻兘绫诲埆
/// </summary>
public enum FunctionCategory
{
@@ -95,7 +95,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -288,9 +288,6 @@
VideoIntercom = 0x21,
}
-
-
-
public enum InfraredCode_TV
{
--
Gitblit v1.8.0