Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Login.xaml.cs

@@ -42,7 +42,6 @@ namespace formula_manage
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //登录按钮事件
         {
-
             if ((Name.Text == "engineer" || Name.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
             {
                 MainWindow Main = new MainWindow();