fixed conflict

2020-06-08 08:56:05 +08:00
parent 5609d4fd09 66acbeee8b
commit 3b063ac1fd
11 changed files with 345 additions and 151 deletions
--- a/extend/catcher/CatchAdminService.php
+++ b/extend/catcher/CatchAdminService.php
@@ -1,7 +1,7 @@
 <?php
 namespace catcher;

-use catcher\command\TestCommand;
+use catcher\command\publish\WechatCommand;
 use catcher\command\Tools\BackupCommand;
 use catcher\command\Tools\CompressPackageCommand;
 use catcher\command\CreateModuleCommand;
@@ -70,8 +70,8 @@ class CatchAdminService extends Service
            WsWorkerCommand::class,
            ExportDataCommand::class,
            MakeMenuCommand::class,
-            TestCommand::class,
            ExcelTaskCommand::class,
+            WechatCommand::class
        ]);
    }
    /**