修复冲突

app/Http/Services/AdminUserService.php

@@ -43,6 +43,16 @@ class AdminUserService
         return $codeId;
         return $codeId;
     }
     }
 
 
+    public function getAdminIdByUserName($userName)
+    {
+       return UserInfoModel::where('name', $userName)->value('userId');
+    }
+
+    public function getAdminIdByEmail($email)
+    {
+        return UserInfoModel::where('email', $email)->value('userId');
+    }
+
     public function getCodeIdsByUserIds($userIds)
     public function getCodeIdsByUserIds($userIds)
     {
     {
         $intraCodeModel = new IntracodeModel();
         $intraCodeModel = new IntracodeModel();

app/Http/routes.php

@@ -62,5 +62,4 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
 });
 });
 
 
 Route::match(['get', 'post'], '/test', function () {
 Route::match(['get', 'post'], '/test', function () {
-    (new \App\Http\Services\DataService())->exportSupplierPurchaseChannelUser('admin');
 });
 });