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

MainWindow.xaml

@@ -142,7 +142,6 @@
                     </Style.Triggers>
                 </Style>
             </DataGrid.CellStyle>
-
             <DataGrid.Resources>
                 <Style x:Key="CellStyle" TargetType="{x:Type DataGridCell}">
                     <Setter Property="Focusable" Value="False"/>
@@ -151,7 +150,6 @@
                     <Setter Property="Foreground" Value="#000000"/>
                 </Style>
             </DataGrid.Resources>
-
             <DataGrid.Columns>
                 <!--列信息绑定-->
                 <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" Binding="{Binding ID}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/>