Merge branch 'zjl_discount_20190322' into development

resources/views/orderlist/content.blade.php

@@ -443,7 +443,7 @@
                                     <tr>
                                         <td class="table-list-title">Adtag或其它</td>
                                         <td class="table-list-content" colspan="3">
-                                            <p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
+                                            <p><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
                                         </td>
                                     </tr>
                                 </table>