# Conflicts:
#	wuye-manager-uniapp/pages/index/index.vue
解决冲突
This commit is contained in:
zhouyanli
2026-06-04 17:06:19 +08:00
parent 4007d2e726
commit 87b5269b87

View File

@@ -305,12 +305,10 @@ const slelctHomeData = data => {
getNoticeData() getNoticeData()
getInspectionData() getInspectionData()
} }
onShow(() => {
onShow(()=>{ getbannarData()
getbannarData() getInspectionData()
getInspectionData()
currentVillageData() currentVillageData()
}) })
onLoad(() => { onLoad(() => {