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

UserWindow/UserSet.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SunlightAggregationManager.UserWindow"
         mc:Ignorable="d"
-        Title="UserSet" Height="450" Width="800" WindowStyle="None" >
+        Title="UserSet" Height="450" Width="800">
     <Grid>
         
     </Grid>

Window/UserSet.xaml

@@ -1,12 +0,0 @@
-<Window x:Class="SunlightAggregationManager.UserWindow.UserSet"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SunlightAggregationManager.UserWindow"
-        mc:Ignorable="d"
-        Title="UserSet" Height="450" Width="800" WindowStyle="None" >
-    <Grid>
-        
-    </Grid>
-</Window>

Window/UserSet.xaml.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace SunlightAggregationManager.UserWindow
-{
-    /// <summary>
-    /// UserSet.xaml 的交互逻辑
-    /// </summary>
-    public partial class UserSet : Window
-    {
-        public UserSet()
-        {
-            InitializeComponent();
-        }
-    }
-}