添加打包模块路由

.gitignore

@@ -1,10 +0,0 @@
-.env
-runtime/*
-vendor/*
-/.idea
-/.vscode
-*.log
-public/.htaccess
-public/.user.ini
-public/.well-known/
-vendor.zip

app/admin/command/TaskDy.php

@@ -128,11 +128,4 @@ class TaskDy extends Command
         // 指令输出
         $output->writeln('ok');
     }
-
-
-
-
- 
-
-
 }

app/api/controller/Worker.php

@@ -53,7 +53,11 @@ class Worker extends Base
             //$resData = $stockService::setGoOutStock($this->userinfo['id'], $data);
 
             $insert_data = [
+<<<<<<< HEAD
             'user_id'    => $this->userinfo['id'],
+=======
+                'user_id'    => $this->userinfo['id'],
+>>>>>>> 7417099cf867aa98fa0a09ae05ba232261f7552d
                 'code'       => $data['code'],
                 'order_status' => 0,
                 'remark' => '未找到单号',

app/api/route/route.php

@@ -69,6 +69,10 @@ Route::group('worker', function () {
     Route::rule('index','worker/index','POST');
     //扫码
     Route::rule('scan','worker/scan','POST');
+<<<<<<< HEAD
+=======
+    //扫码记录
+>>>>>>> 7417099cf867aa98fa0a09ae05ba232261f7552d
     Route::rule('scanlog','worker/scanlog','POST');
 })->middleware(AllowCrossDomain::class);