From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4

---
 HDL_ON/Entity/Function/Function.cs |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 5b69485..5c0437e 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>
         /// 澶囨敞
@@ -1070,6 +1070,23 @@
         }
         #endregion
 
+        #region 鑳芥簮
+        /// <summary>
+        /// 鑳芥簮妯″潡
+        /// </summary>
+        public const string EnergyStandard = "energy.standard";
+        /// <summary>
+        /// 鑳芥簮spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> EnergySpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(EnergyStandard);
+            return spkList;
+        }
+        #endregion
+
         #region 闊充箰
         /// <summary>
         /// 锛堥煶涔愶級

--
Gitblit v1.8.0