Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Restaurant/restaurantList.vue

@@ -374,12 +374,8 @@
         </div>
         <div class="btnList">
           <!--v-if="IsEditDmcSource==1"-->
-<<<<<<< HEAD
-          <button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
-=======
           <button  @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button  @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
->>>>>>> ed2f6166e0309b39474529311f2132520fff4845
           <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)"
             class="hotelBtn">{{$t('restaurant.res_package')}}</button>
         </div>