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

Windows/Print.xaml.cs

@@ -85,7 +85,7 @@ namespace formula_manage.Windows
             Template_M.ItemsSource = files_M;//加载合集
             Template_M.DisplayMemberPath = "Name"; // 显示文件名
             DirectoryInfo di_S = new DirectoryInfo(Print_path2.Text);
-            FileInfo[] files_S = di_M.GetFiles();
+            FileInfo[] files_S = di_S.GetFiles();
             Template_S.ItemsSource = files_S;
             Template_S.DisplayMemberPath = "Name";
             Template_M.Text = Temp_M;//传入保存的默认模板
@@ -231,7 +231,7 @@ namespace formula_manage.Windows
 
         private void Button_Click_3(object sender, RoutedEventArgs e)
         {
-
+            
         }
 
         private void Button_Click_4(object sender, RoutedEventArgs e)