From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改

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

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 639aa6e..772be78 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -653,19 +653,19 @@
         /// 褰撳墠鍊�
         /// </summary>
         public object curValue = new object();
-        /// <summary>
-        /// curValue鐨勭炕璇戝��,鏈�鍧忕殑缁撴灉涔熷彧浼氳繑鍥瀞tring.Empty
-        /// </summary>
-        public string realValue
-        {
-            get
-            {
-                var myValue = curValue.ToString();
-                //娌欓洉瀹氫箟鐨刼bject绫诲瀷
-                if (myValue.Contains("{") == true) { return string.Empty; }
-                return myValue;
-            }
-        }
+        ///// <summary>
+        ///// curValue鐨勭炕璇戝��,鏈�鍧忕殑缁撴灉涔熷彧浼氳繑鍥瀞tring.Empty
+        ///// </summary>
+        //public string realValue
+        //{
+        //    get
+        //    {
+        //        var myValue = curValue.ToString();
+        //        //娌欓洉瀹氫箟鐨刼bject绫诲瀷
+        //        if (myValue.Contains("{") == true) { return string.Empty; }
+        //        return myValue;
+        //    }
+        //}
     }
     /// <summary>
     /// 鍔熻兘灞炴�ч敭鍚嶅垪琛�

--
Gitblit v1.8.0