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

MainWindow.xaml

@@ -27,8 +27,9 @@
                 <MenuItem Header="_配送流程管理" FontSize="16"/>
                 <Separator />
                 <MenuItem Header="其它...">
+                    <MenuItem Header="_布种" FontSize="16"/>
                     <MenuItem Header="_品名" FontSize="16"/>
-                    <MenuItem Header="_色号" FontSize="16"/>
+                    <MenuItem Header="_色名" FontSize="16"/>
                     <MenuItem Header="_客户" FontSize="16"/>
                 </MenuItem>
             </MenuItem>

MainWindow.xaml.cs

@@ -69,12 +69,22 @@ namespace formula_manage
             APP_set.ShowDialog();//实例化并置顶打开设置窗口    
         }
 
+        private void USER_SET(object sender, RoutedEventArgs e)
+        {
+          
+        }
+
         private void HELP(object sender, RoutedEventArgs e)
         {
             Help help_page = new Help();
             help_page.ShowDialog();//实例化并置顶打开信息窗口              
         }
 
+        private void MAC_SET(object sender, RoutedEventArgs e)
+        {
+
+        }
+
         private void STUFF(object sender, RoutedEventArgs e)
         {
             Windows.Stuff stuff = new Windows.Stuff();