Merge remote-tracking branch 'yct_v2_in_SS/dev' into dev

PLCLinker/centralController/serversettings.json

@@ -2,7 +2,7 @@
 
   "ssl": "false",
   "host": "192.168.0.106",
-  "garageID":"2",
+  "garageID":"6",
   "port": "9000",
   "size": "1024"
 }

PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt

@@ -7,3 +7,12 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.CoreCompileInputs.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.exe.config
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\bin\Release\socketTest.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.Form1.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.Properties.Resources.resources
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.GenerateResource.Cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
+E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojResolveAssemblyReference.cache