Merge branch 'test/B' into dev/百宝箱安装器

# Conflicts:
#	MainWindow.xaml.cs

MainWindow.xaml.cs

@@ -8,7 +8,7 @@ namespace Dqkj.Setup
     {
         public MainWindow()
         {
-            InitializeComponent();//AAAAAAAAA
+            InitializeComponent();//BBBB
         }
 
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)