Merge branch 'master' of qk:zy_duanju/duanju_manage into test

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -34,6 +34,7 @@ class MiniprogramController extends Controller
         }
         return $this->miniprogram->where($where)->paginate(20)->map(function($item,$k){
             $item->type_name = MiniprogramType::from($item->type)->name();
+            $item->status_name = $item->status == 1 ?'启用':'禁用';
             return $item;
         });
     }