Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

ConvertMoels/ColorSQLConvert.cs

@@ -21,7 +21,7 @@ namespace Audit.ConvertMoels
         {
             if (value != null)
             {
-                string colorValue = string.Format("{0:X6}", (int)value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
+                string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
                                                                         //string StuffColor = "#FF" +  colorValue;//RGB数值拼接为ARGB数值（正向）
                 string StuffColor_B = colorValue.Substring(0, 2);//获取蓝色参数
                 string StuffColor_G = colorValue.Substring(2, 2);//获取绿色参数
@@ -31,14 +31,14 @@ namespace Audit.ConvertMoels
             }
             else
             {
-                return "";//返回白色RGB数值
+                return null;//返回白色RGB数值
             }
         }
     /// <summary> 
     /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return "";
+            return null;
         }
     }
 }

ConvertMoels/ProductTypeSQLConvert.cs

@@ -53,7 +53,7 @@ namespace Audit.ConvertMoels
         /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return "";
+            return null;
         }
     }
 }