From 620880da2e11fe0a56d24662f4736332bf08e9e5 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 31 五月 2024 15:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 3763e6a..5b3cbdc 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -29,6 +29,7 @@
     auxiliaryOutputWorkingHours,
     auxiliaryWorkingHoursDay,
     auxiliaryCorrectionHours,
+    insBushing
   }
 }
 
@@ -158,8 +159,8 @@
   selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
   costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
   selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
-  updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
-  updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+  updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+  updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
 }
 
 const sampleOrder = {
@@ -328,3 +329,7 @@
 const auxiliaryCorrectionHours = {
   selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
 }
+
+const insBushing = {
+  selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}

--
Gitblit v1.9.3