预订/入场/VIP不公开/我的付款
显示合计金额
微信图文消息维护
Merge branch 'master' of https://github.com/crabo/Reservation

Conflicts:
	SPWeb/Areas/Reserve/Controllers/TableController.cs
	SPWeb/Areas/Reserve/Views/Table/AdminOrder.cshtml
	SPWeb/Areas/Reserve/Views/Table/AdminShowOrders.cshtml
	SPWeb/SPWeb.csproj