Merge branch 'dev' into dev-sxb

app/controller/admin/user/User.php

@@ -998,7 +998,7 @@ class User extends BaseController
         $data['ylj']=$ylj?$ylj:0;
         $revenue = Db::name("user_bill")
             ->where(["uid" => $id, "type" => "commission"])
-            ->whereIn('status', [0, 1])
+            ->whereIn('status', [1])
             ->sum('number');
         $data['revenue']=$revenue?$revenue:0;
         return app('json')->success($data);