diff --git a/src/views/sysworkflow/codepage/page0318.vue b/src/views/sysworkflow/codepage/page0318.vue
index 1b4303cb0..72d1a2840 100644
--- a/src/views/sysworkflow/codepage/page0318.vue
+++ b/src/views/sysworkflow/codepage/page0318.vue
@@ -7,9 +7,9 @@
 
 </script>
 <template>
-<<<<<<< HEAD
-		<div></div>
-=======
+
+		<div>
+
   <cardadd v-model:visible="drawerRefadd" :keyval="props.visible" @data="handleNewCard"/>
   <cardedit v-model:visible="drawerRefedit" :keyval="props.visible" @data="handleNewCard"/>
   <el-row :gutter="10">
@@ -72,7 +72,7 @@
     <el-pagination layout="prev, pager, next" :total="50" />
   </div>
 
->>>>>>> v8_master
+</div>
 </template>
 <style  lang='scss' scoped>
 
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index 3595a9d64..76b389c4a 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -569,16 +569,16 @@ onMounted(() => {
 	getInitData()
 })
 //监听版本变化
-<<<<<<< HEAD
+
 watch(() =>versionId.value ,(val:string)=>{
 	emits('update:formVersion', val)
 })	
-=======
+
 // watch(() =>versionId.value ,(val:string)=>{
 // 	emits('update:formVersion', val)
 
 // })	
->>>>>>> lwx_v9
+
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-09 14:29:06