Merge branch 'stable' into test

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -138,7 +138,7 @@ class AdvertiserController extends CatchController
             'miniProgramIds' => 'required|array|min:1',
             'miniProgramIds.*' => 'required|integer',
             'status' => 'required|in:1,2',
-            'remark' => 'string|max:140',
+            'remark' => 'nullable|string|max:140',
         ]);
         $uid = $request->input('id');
         $user = DB::table('users')

modules/Operation/Service/ChannelServic.php

@@ -30,7 +30,7 @@ class ChannelServic extends BaseService
             foreach ($list as  $value){
                 $value->type_txt = $type[$value->type]['name'] ?? "-";
                 $value->miniprogram_type_text = $minParamType[$value->miniprogram_type]['name'] ?? "-";
-                $value->duanjus = collect($value->duanjus)->sortBy('sort');
+                $value->duanjus = collect($value->duanjus)->sortBy('sort')->toArray();
             }
         }
         return $list;