zhulizhen1111 %!s(int64=5) %!d(string=hai) anos
pai
achega
8fa304ac50
Modificáronse 1 ficheiros con 0 adicións e 5 borrados
  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']