diff --git a/DataServer/DataServer.csproj b/DataServer/DataServer.csproj
index 2672e46..d371667 100644
--- a/DataServer/DataServer.csproj
+++ b/DataServer/DataServer.csproj
@@ -78,24 +78,18 @@
     <Compile Include="api\select_switching_room.cs" />
     <Compile Include="api\Test.cs" />
     <Compile Include="BLL\device_data.cs" />
-<<<<<<< HEAD
-    <Compile Include="BLL\electricity_data.cs" />
-    <Compile Include="DAL\device_data.cs" />
-    <Compile Include="api\get_realtime_data.cs" />
-    <Compile Include="DAL\electricity_data.cs" />
-    <Compile Include="Model\device_data.cs" />
-    <Compile Include="Model\electricity_data.cs" />
-=======
     <Compile Include="BLL\device_operation.cs" />
+    <Compile Include="BLL\electricity_data.cs" />
     <Compile Include="BLL\electricity_price.cs" />
     <Compile Include="DAL\device_data.cs" />
     <Compile Include="api\get_realtime_data.cs" />
     <Compile Include="DAL\device_operation.cs" />
+    <Compile Include="DAL\electricity_data.cs" />
     <Compile Include="DAL\electricity_price.cs" />
     <Compile Include="Model\device_data.cs" />
     <Compile Include="Model\device_operation.cs" />
+    <Compile Include="Model\electricity_data.cs" />
     <Compile Include="Model\electricity_price.cs" />
->>>>>>> a31031730429b8342c504bc04067bf2082474729
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />
diff --git a/DataServer/bin/Debug/DataServer.pdb b/DataServer/bin/Debug/DataServer.pdb
index 1225438..88399fb 100644
Binary files a/DataServer/bin/Debug/DataServer.pdb and b/DataServer/bin/Debug/DataServer.pdb differ
diff --git a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
index be11251..1f76ed4 100644
--- a/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
+++ b/DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d88e5927d0223dfdd2a01652495a02c4a12712a0
+7d79bf438b24b7911c0f400411eb86a062fada60
diff --git a/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt b/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt
index 7c0a2d1..4538626 100644
--- a/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt
+++ b/DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt
@@ -8,13 +8,3 @@ E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug
 E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\Maticsoft.DBUtility.dll
 E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\MySql.Data.dll
 E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\obj\Debug\DataServer.csproj.CopyComplete
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.dll
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.pdb
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.Common.dll
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.DBUtility.dll
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\MySql.Data.dll
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.AssemblyReference.cache
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CoreCompileInputs.cache
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CopyComplete
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.dll
-E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.pdb
diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll
index 999360d..9496a96 100644
Binary files a/DataServer/obj/Debug/DataServer.dll and b/DataServer/obj/Debug/DataServer.dll differ
diff --git a/DataServer/obj/Debug/DataServer.pdb b/DataServer/obj/Debug/DataServer.pdb
index 1225438..88399fb 100644
Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ
diff --git a/DongYingAPI/bin/DataServer.dll b/DongYingAPI/bin/DataServer.dll
index 999360d..9496a96 100644
Binary files a/DongYingAPI/bin/DataServer.dll and b/DongYingAPI/bin/DataServer.dll differ
diff --git a/DongYingAPI/bin/DataServer.pdb b/DongYingAPI/bin/DataServer.pdb
index 42ad147..88399fb 100644
Binary files a/DongYingAPI/bin/DataServer.pdb and b/DongYingAPI/bin/DataServer.pdb differ
diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll
index b01e601..da8bd9c 100644
Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ
diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb
index 400e846..e67f11c 100644
Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
index fc4c3eb..9c228b5 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache and b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache
index 743b203..804fae5 100644
--- a/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache
+++ b/DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b526cf08f7ad4fa5d3dbc021cd0796d7b46d7433
+fb5b9c8b46a48a3d02864cb0cc1a38db724aeeb0
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll
index b01e601..da8bd9c 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb
index 400e846..e67f11c 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ
diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll
index 999360d..9496a96 100644
Binary files a/Security/bin/Debug/DataServer.dll and b/Security/bin/Debug/DataServer.dll differ
diff --git a/Security/bin/Debug/DataServer.pdb b/Security/bin/Debug/DataServer.pdb
index 1225438..88399fb 100644
Binary files a/Security/bin/Debug/DataServer.pdb and b/Security/bin/Debug/DataServer.pdb differ
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index 44443ae..ff7b9da 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>eHplheXohStLfcRjvGonNGrTP62CVZF04TweIowb6KA=</dsig:DigestValue>
+        <dsig:DigestValue>EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest
index c9a89d4..49869dd 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="50688">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="66560">
       <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>95yQC5xWwWknnVT5WmQt+ovDi6utCSBiLGtaV4WtWYM=</dsig:DigestValue>
+        <dsig:DigestValue>ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache
index 507157c..44218d0 100644
Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index 44443ae..ff7b9da 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>eHplheXohStLfcRjvGonNGrTP62CVZF04TweIowb6KA=</dsig:DigestValue>
+        <dsig:DigestValue>EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest
index c9a89d4..49869dd 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="50688">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="66560">
       <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>95yQC5xWwWknnVT5WmQt+ovDi6utCSBiLGtaV4WtWYM=</dsig:DigestValue>
+        <dsig:DigestValue>ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>