zhulizhen1111 5 年之前
父節點
當前提交
8fa304ac50
共有 1 個文件被更改,包括 0 次插入5 次删除
  1. 0 5
      src/views/equipment/fenbuPic.vue

+ 0 - 5
src/views/equipment/fenbuPic.vue

@@ -49,11 +49,6 @@ export default {
         getFloorData() {
             let postParams = {
                 Distinct: true,
-<<<<<<< HEAD
-                Filters: `projectId =${this.$store.state.plazaId}; categoryId='XFBFYCFL';isPub=true`,
-=======
-                Filters: `projectId =${this.$store.state.plazaId};categoryId='XTYLT';isPub=true`,
->>>>>>> 4fc95b05ad81abc33c44ac2be3ffca29d9da58fe
                 PageNumber: 1,
                 PageSize: 500,
                 Projection: ['floorId']