1、代码合并

SKMC.API/Client/Access/ClientAccessCodes.cs

@@ -44,6 +44,14 @@ namespace SKMC.Api.Client.Access
         /// </summary>
         public static string MachineConfigOper = "MachineConfigOper";
         /// <summary>
+        /// 机台驱动器参数修改界面可视
+        /// </summary>
+        public static string MachineDriverEditView = "MachineDriverEditView";
+        /// <summary>
+        /// 机台驱动器参数修改界面可操作
+        /// </summary>
+        public static string MachineDriverEditOper = "MachineDriverEditOper";
+        /// <summary>
         /// 配方界面可视
         /// </summary>
         public static string RecipeView = "RecipeView";

SKMC.API/SKMC.API.csproj

@@ -154,6 +154,7 @@
     <Compile Include="Machine\Model\MachineSlaveError.cs" />
     <Compile Include="Machine\Monitor\MachineLatchTask.cs" />
     <Compile Include="Machine\Monitor\MachineStateLatchMonitor.cs" />
+    <Compile Include="Motion\Driver\IMotionDriverError.cs" />
     <Compile Include="Recipe\Model\RecipeSpeedGroup.cs" />
     <Compile Include="Vision\SKV0\SKVisionClient.cs" />
     <Compile Include="Vision\SKV0\SKVisionProtocol.cs" />