Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Mesnac.PlcUtils/Impl/SiemensPlc.cs

@@ -15,7 +15,7 @@ namespace Mesnac.PlcUtils.Impl
 
         private StringChange stringChange = StringChange.Instance;
 
-        private const SiemensPLCS type = SiemensPLCS.S200Smart;
+        private const SiemensPLCS type = SiemensPLCS.S1200;
 
         private SiemensS7Net s7 = new SiemensS7Net(type);
 

Mesnac.PlcUtils/Mesnac.PlcUtils.csproj

@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HslCommunication">
-      <HintPath>Z:\Desktop\日常代码\榄菊项目\程序设计\lj_plc\PlugInPlatform\HslCommunication.dll</HintPath>
+      <HintPath>..\PlugInPlatform\HslCommunication.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.Core">
-      <HintPath>Z:\Desktop\日常代码\榄菊项目\程序设计\lj_plc\PlugInPlatform\ICSharpCode.Core.dll</HintPath>
+      <HintPath>..\PlugInPlatform\ICSharpCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.Data.Core">
-      <HintPath>Z:\Desktop\日常代码\榄菊项目\程序设计\lj_plc\PlugInPlatform\ICSharpCode.Data.Core.dll</HintPath>
+      <HintPath>..\PlugInPlatform\ICSharpCode.Data.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />