Merge branch 'liuzj-permission-dev' into test

composer.json

@@ -20,6 +20,7 @@
         "phpoffice/phpexcel": "^1.8",
         "phpoffice/phpspreadsheet": "^1.28",
         "predis/predis": "^2.1",
+        "qiniu/php-sdk": "^7.4",
         "vinkla/hashids": "*"
     },
     "require-dev": {

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -104,7 +104,7 @@ class AdvertiserController extends CatchController
                 $item->miniPrograms = [];
                 foreach (explode(',', $item->miniProgramIds) as $miniProgramId) {
                     $miniProgram = $miniPrograms->get($miniProgramId);
-                    $miniProgram->type_logo = $logos[$miniProgram->type] ?? '';
+                    $miniProgram->type_logo = $logos[$miniProgram->type ?? -1] ?? '';
                     $item->miniPrograms[] = $miniProgram;
                 }
             }