From af75a6d0da5ec8fc86d34bba29d21b55e5b411f0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十二月 2023 09:06:27 +0800
Subject: [PATCH] 解决冲突
---
src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
index ead76bf..e3bea1f 100644
--- a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
+++ b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
@@ -1,8 +1,5 @@
<!-- 鍦烘櫙鍩烘湰淇℃伅缂栬緫 -->
<template>
-<<<<<<< HEAD
- <FYForm :form-info="_formInfo" :rules="rules" @submit="submit" @cancel="cancel">
-=======
<FYForm
:form-info="_formInfo"
:rules="rules"
@@ -10,7 +7,6 @@
@submit="submit"
@cancel="cancel"
>
->>>>>>> 356f54467f525f437f41271fb62f6be66f2ab1e5
<template #form-item="{ formObj }">
<el-form-item label="鍦烘櫙鍚嶇О" prop="name">
<el-input clearable show-word-limit v-model="formObj.name" placeholder="鍦烘櫙鍚嶇О" />
--
Gitblit v1.9.3