Merge branch 'master' into test

modules/Channel/Services/WechatMinprogram/WechatMinprogramUserService.php

@@ -13,6 +13,7 @@ use Carbon\Carbon;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Str;
 use Modules\Channel\Models\MiniprogramUserVip;
 use Modules\Channel\Models\Order;
 use Modules\Channel\Models\UidLogs;