Merge branch 'zjl_pay_refund_20190123' into development

resources/views/erpOrder/content.blade.php

@@ -128,7 +128,7 @@
                 <tbody>
                 <tbody>
                     @foreach ($list as $v)
                     @foreach ($list as $v)
                         <tr>
                         <tr>
-                            <td class="show-list">{{$v['mobile'] ? $v['mobile'] : $v['email']}}</td>   
+                            <td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>   
                             <td class="show-list">
                             <td class="show-list">
 	                            <?php
 	                            <?php
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';