From e7909dd4a996ac891c8faa8d00ba93e20543fa97 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Mon, 17 Jul 2023 12:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/housingView/apartment.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue
index 0401547..dc49617 100644
--- a/src/views/housingView/apartment.vue
+++ b/src/views/housingView/apartment.vue
@@ -17,17 +17,13 @@
 import pageTopBar from '../../components/pageTopBar/pageTopBar.vue';
 import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
-<<<<<<< HEAD
 import apartmentItem from '@/components/public/apartment-item.vue';
 import haveQuestions from '@/components/public/have-questions.vue'
 import pageFooter from '@/components/footer/footer.vue'
 import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
 import { ElLoading } from 'element-plus'
 import Masonry from 'masonry-layout';
-=======
-import { ref, onMounted, watch } from 'vue';
-// import Masonry from 'masonry-layout';
->>>>>>> origin/main
+
 
 const { proxy } = getCurrentInstance()