Merge branch 'zjl_self_refund_20190605' into development

resources/views/returnDetails/content.blade.php

@@ -92,7 +92,7 @@
 
 
                     <div class="layui-row">
                     <div class="layui-row">
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md6">
-                           <label class="layui-form-label">退款物流：</label>
+                           <label class="layui-form-label">退货物流：</label>
                             <span class="layui-text">{{ App\Http\Controllers\getShippingName($return['shipping_id']) }}</span>
                             <span class="layui-text">{{ App\Http\Controllers\getShippingName($return['shipping_id']) }}</span>
                         </div>
                         </div>