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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -103,7 +103,7 @@
                 {{subItem.MealName}}
               </td>
               <td v-if="childIndex==0" :rowspan="3">
-                {{GuestNum}}
+                {{subItem.UseAccount}}
               </td>
               <td>
                 {{personStrToWord(childItem.PeopleType)}}

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2011,7 +2011,7 @@
 
               </td>
               <td>
-                <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;"
+                <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis"
                   :title="childItem.ContactName">
                   {{childItem.ContactName}}</p>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12">{{childItem.ContactMobile}}</p>