diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
index 97abbfcf..c66eff13 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
@@ -168,8 +168,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         [HttpPost("importExcel")]
         public IActionResult ImportExcel()
         {
-
-
             IFormFileCollection files = Request.Form.Files;
             foreach (IFormFile file in files)
             {
@@ -193,11 +191,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             return null;
         }
 
-        public IActionResult importTemplate()
-        {
-            return null;
-
-        }
     }
 
 }
diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
index fd30d137..87aa87b1 100644
--- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
@@ -174,7 +174,6 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
         public IActionResult UpdateWorkorder([FromBody] ProWorkorder proWorkorder)
         {
             // TODO  判断更新的数量是否超过计划数
-
             int data = 0;
             if (proWorkorder != null)
             {
diff --git a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs
index a4c12f92..c083f40e 100644
--- a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs
@@ -94,6 +94,8 @@ namespace ZR.Admin.WebApi.Extensions
                         new List<string>()
                     }
                 });
+
+                c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
             });
         }
     }