修改冲突

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