Merge branch 'dev' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into dev

pages/meetingRoomList/meetingRoomList.js

@@ -120,7 +120,7 @@ create.Page({
     getReserveRoomList(data).then(res => {
       if (res.data.data) {
         for (let value of res.data.data) {
-          value.name = `${this.getParentStr("1250241601903665153")}${value.name}`
+          value.name = `${this.getParentStr(value.locationId)}${value.name}`
           this.parentStr = ''
         }
         let reserveRoomList = res.data.data.map(item => {