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

Window/UserSet.xaml

@@ -1,9 +1,9 @@
-<Window x:Class="SunlightAggregationManager.Window.UserSet"
+<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.Window"
+        xmlns:local="clr-namespace:SunlightAggregationManager.UserWindow"
         mc:Ignorable="d"
         Title="UserSet" Height="450" Width="800" WindowStyle="None" >
     <Grid>

Window/UserSet.xaml.cs

@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace SunlightAggregationManager.Window
+namespace SunlightAggregationManager.UserWindow
 {
     /// <summary>
     /// UserSet.xaml 的交互逻辑