From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/Entity/Function/Function.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 17bec36..f7f94b2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,7 +173,7 @@
#endregion
- #region base info
+ #region base info
public string sid = "0301011234567801012301230123";
/// <summary>
/// 澶囨敞
@@ -1222,6 +1222,18 @@
/// </summary>
public const string TvIr = "ir.tv";
/// <summary>
+ /// 瀹剁數銆侀鎵�
+ /// </summary>
+ public const string ElectricFan = "electrical.fan";
+ /// <summary>
+ /// 鍑夐湼
+ /// </summary>
+ public const string ClothesHanger = "electrical.racks";
+ /// <summary>
+ /// 绾㈠閬ユ帶鍣�
+ /// </summary>
+ public const string IrLearn = "ir.learn";
+ /// <summary>
/// 绾㈠鎶曞奖浠�
/// </summary>
public const string PjtIr = "ir.pjt";
@@ -1240,23 +1252,11 @@
/// <summary>
/// 绾㈠鐑按鍣�
/// </summary>
- public const string HeaterIr = " ir.water_heater";
+ public const string HeaterIr = " ir.water_heater";
/// <summary>
/// 绾㈠椋庢墖
/// </summary>
public const string FanIr = "ir.fan";
- /// <summary>
- /// 瀹剁數銆侀鎵�
- /// </summary>
- public const string ElectricFan = "electrical.fan";
- /// <summary>
- /// 鍑夐湼
- /// </summary>
- public const string ClothesHanger = "electrical.racks";
- /// <summary>
- /// 绾㈠閬ユ帶鍣�
- /// </summary>
- public const string IrLearn = "ir.learn";
#region 娑傞甫
/// <summary>
@@ -1301,6 +1301,13 @@
#endregion
+ #region 鑳芥簮
+ /// <summary>
+ /// 鑳芥簮-鐢佃兘
+ /// </summary>
+ public const string ElectricEnergy = "energy.electric";
+ #endregion
+
#region 璁惧绫�
/// <summary>
/// 绾㈠瀹�
--
Gitblit v1.8.0