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

# Conflicts:
#	app/Http/Controllers/Api/UploadController.php
#	app/Http/Controllers/Controller.php

app/Http/Controllers/Api/LoginController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Models\Agent;
 use App\Models\User;
-use App\Models\UserChannel;
 use EasyWeChat\Factory;
 use EasyWeChat\Kernel\Exceptions\InvalidConfigException;
 use Illuminate\Support\Facades\Cache;