Merge branch 'zjl_adjust_20181026' into development

resources/views/detail/changeOrder.blade.php

@@ -153,7 +153,8 @@
                                         <p>
                                             <?php 
                                                 $sid = explode('.', $k)[1];
-                                                echo App\Http\Controllers\getSupplierName($sid); 
+                                                // echo App\Http\Controllers\getSupplierName($sid); 
+                                                echo $sid; 
                                             ?>
                                         </p>  
                                     @else