fix conflicts

app/Http/routes.php

@@ -75,7 +75,7 @@ Route::group(['middleware' => 'web'], function () {
     Route::match(['get', 'post'], '/tempcount',               'OrderController@tempCount');
 
     Route::post('/ajaxDownloadContract',                      'OrderController@ajaxDownloadContract');
-       
+
     Route::post('/ajaxInputCancelReason',                     'OrderController@ajaxInputCancelReason');
 
 });

resources/views/detail/content.blade.php

@@ -279,9 +279,9 @@
                                     <td>
                                         <?php 
                                             switch ($order_invoice_info['inv_type']) {
-                                                case 2: echo '个人普通发票';break;
-                                                case 3: echo '增值税发票';break;
-                                                case 4: echo '公司普通发票';break;
+                                                case 2: echo '普通发票';break;
+                                                case 3: echo '增值税专用发票';break;
+                                                case 4: echo '增值税普通发票';break;
                                             }
                                         ?>
                                     </td>