From 6b3c4d87c500442f9774904c6a1117fe7cee5b5f Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期三, 24 九月 2025 17:50:40 +0800
Subject: [PATCH] 退货检验平板优化、任务单加序列号
---
MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
index 552608c..e4a9ccf 100644
--- a/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
+++ b/MESApplication/Controllers/QC/MesOqcItemsDetect02Controller.cs
@@ -58,7 +58,6 @@
}
}
-<<<<<<< HEAD
[HttpPost("SetQSItems")]
public ResponseResult SetQSItems([FromBody] JObject data)
{
@@ -104,8 +103,6 @@
}
}
-=======
->>>>>>> 3b90e8717befe39af4d9384252d27b7a768a773f
//IqcQaSubmit
[HttpPost("IqcQaSubmit")]
public ResponseResult IqcQaSubmit(LLJDto rkjDto)
--
Gitblit v1.9.3