合并分支 'heshupeng' 到 'master'

后台显示订单备注



查看合并请求 !376

@@ -45,6 +45,15 @@
 						</div>
 						</div>
 					</div>
 					</div>
 
 
+					<div class="panel panel-default">
+						<div class="panel-heading">备注</div>
+						<table class="table">
+							<tr>
+								<td>{$vo.remark}</td>
+							</tr>
+						</table>
+					</div>
+
 <!--					<div class="row" style="margin:1em 0;">-->
 <!--					<div class="row" style="margin:1em 0;">-->
 <!--						<div class="col-md-4 padding">-->
 <!--						<div class="col-md-4 padding">-->
 <!--							<span class="label label-success">{:__('Freight_status')}</span> :-->
 <!--							<span class="label label-success">{:__('Freight_status')}</span> :-->