From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/technology/document/checkStandardTable.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/views/technology/document/checkStandardTable.vue b/src/views/technology/document/checkStandardTable.vue
index d6d9d41..3ab90a5 100644
--- a/src/views/technology/document/checkStandardTable.vue
+++ b/src/views/technology/document/checkStandardTable.vue
@@ -344,7 +344,10 @@
getOperationTestStandardParam,
addOperationTestStandardParam
} from '@/api/plan/moteststandard'
-import { getTestStandardParams } from '@/api/quality/teststandard'
+import {
+ getTestStandardParams
+} from '@/api/technology/document'
+//import { getTestStandardParams } from '@/api/quality/teststandard'
import testStandardDialog from '@/views/common/teststandard'
import EditOrderParamForm from './editparamform'
import ParamDialog from '@/views/common/param.vue'
--
Gitblit v1.9.3