From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a7-standard-method.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index b210005..e291006 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -164,8 +164,8 @@
multiple: true
},
},
- requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct', 'isUse', 'nameEn'],
- requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct', 'isUse', 'nameEn']
+ requiredAdd: ['code', 'name', 'isProduct', 'isUse', 'nameEn'],
+ requiredUp: ['code', 'name', 'isProduct', 'isUse', 'nameEn']
},
entityCopy: {},
upIndex: 0,
--
Gitblit v1.9.3