Merge remote-tracking branch 'origin/dev' into dev

crmeb/jobs/ImportProductJob.php

@@ -10,7 +10,6 @@ class ImportProductJob implements JobInterface
 {
     public function fire($job, $data)
     {
-        Log::info('开始导入商品:');
         if ($job->attempts() > 1) {
             $job->delete();
             $this->failed($data);

crmeb/services/SpreadsheetExcelService.php

@@ -378,7 +378,7 @@ class SpreadsheetExcelService
         if($is_limit==true){
             $limit=$sheet->getHighestRow();
             if($limit>$count){
-                throw new ValidateException('导入的条数超过限制数量:'.$count);
+                throw new ValidateException('导入的条数超过限制数量:'.$count.',当前表格数量'.$limit);
             }
         }