From df455987cd863eb5531c34533d63ed8f4f15230c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 02 七月 2020 20:54:58 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Helper/PropertyConvertHelper.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
index 71787f8..3117d1e 100644
--- a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
+++ b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
@@ -1,5 +1,7 @@
-锘縰sing Bro.Common.Factory;
+锘縰sing Autofac;
+using Bro.Common.Factory;
using Bro.Common.Interface;
+using Bro.Common.Model;
using Newtonsoft.Json;
using System;
using System.Collections;
@@ -182,6 +184,13 @@
}
return "";
}
+
+ //foreach (DictionaryEntry myDE in Hash)
+ //{
+ // if (myDE.Key.Equals(v))
+ // return myDE.Value;
+ //}
+ return null;
}
}
catch (Exception)
@@ -914,7 +923,7 @@
return base.EditValue(context, provider, value);
}
- }
+ }
#endregion
}
--
Gitblit v1.8.0