From cb99e1745cd8dab77848e4d59366f098355f7d02 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 27 Jun 2024 16:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lowcodepage/appPage/appPageForm/openAppFormPage.vue     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index 5fad9b83c..8e7be6a2e 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -165,10 +165,7 @@ const gainAppFormPageInit = () =>{
 			versionTitle.value = data.data.appForm.name
 			if(data.data.pageList){
 				let stateData = string2json(data.data.appForm.listjson)
-<<<<<<< HEAD
-				console.log("列表数据---》",stateData)
-				console.log("列表数据-2--》",data.data.appForm.listjson)
-=======
+
 				
 				if(stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
@@ -195,7 +192,6 @@ const gainAppFormPageInit = () =>{
 				
 				
 
->>>>>>> lwx_v12
 				stateList.tableData = stateData.tableData
 				stateList.searchData = stateData.searchData
 				stateList.loading = stateData.loading