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

MainWindow.xaml

@@ -154,7 +154,7 @@
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 <DataGridTemplateColumn Header="计算单位" Width="80"  MaxWidth="80" MinWidth="80" CanUserReorder="False" CellStyle="{StaticResource CellStyle}">
-                    <DataGridTemplateColumn.CellTemplate  >
+                    <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False">
                                 <ComboBoxItem Content="%"></ComboBoxItem>