Merge branch 'today' into dev

app/Models/RechargeChannel.php

@@ -54,7 +54,7 @@ class RechargeChannel extends BaseModel
             $query = $query->whereIn($field, $type);
         }
         
-        $product = $query->orderBy('sort', 'asc')->select(['id', 'data_type','name','recharge_type', 'withdraw_type', 'activity_type','min','max','fixed','rate'])->get()->toArray();
+        $product = $query->orderBy('sort', 'asc')->select(['id', 'data_type','name','type', 'min','max','fixed','rate'])->get()->toArray();
         
         $list = [];
         foreach($product as $key => $pv) {