Merge remote-tracking branch 'origin/master'

app/Service/OperationLogService.php

@@ -19,6 +19,8 @@ class OperationLogService extends Service
         return self::$instance;
     }
 
+//    public function
+
 
     public function insertOperationLog($insert){
         try {

app/Service/SalesOrderService.php

@@ -225,7 +225,7 @@ class SalesOrderService extends Service
             DB::commit();
         }catch (\Exception $exception){
             DB::rollBack();
-            return [false,$exception->getMessage()];
+            return [false,$exception->getLine().':'.$exception->getMessage()];
         }
 
         return [true,''];