xiongzhu 5 роки тому
батько
коміт
f6aac4c937

+ 2 - 1
CardApi/KateDoor.cs

@@ -1,4 +1,5 @@
-using System;
+#pragma warning disable CS0436 // 类型与导入类型冲突
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;

+ 3 - 1
CardApi/ProUsb.cs

@@ -1,4 +1,5 @@
-using log4net;
+#pragma warning disable CS0436 // 类型与导入类型冲突
+using log4net;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -6,6 +7,7 @@ using System.Text;
 
 namespace CardApi
 {
+
     public class ProUsb : CardApi
     {
         public static readonly ILog log = LogManager.GetLogger("ProUsb");

+ 2 - 1
ConfigureWindow/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
-using CardApi;
+#pragma warning disable CS0436 // 类型与导入类型冲突
+using CardApi;
 using ConfigureWindow.domain;
 using log4net;
 using MaterialDesignThemes.Wpf;

+ 2 - 1
ConfigureWindow/MainWindowViewModel.cs

@@ -1,4 +1,5 @@
-using CardApi;
+#pragma warning disable CS0436 // 类型与导入类型冲突
+using CardApi;
 using Config.Net;
 using ConfigureWindow.domain;
 using System;