Merge branch 'master' into develop

common/business/ExchangeBusiness.php

@@ -85,6 +85,17 @@ class ExchangeBusiness
             $quotation['last'] = (float)sprintf("%0.4f", $quotation['rmb'] / $rate);
             goto doEnd;
         }
+
+        if (strtoupper($tag) == 'DUSDT') {
+            $quotation = [
+                'low' => 6.99,
+                'high' => 6.99,
+                'last' => 6.99,
+                'rmb' => 6.99,
+            ];
+            goto doEnd;
+        }
+
         if (strtoupper($tag) == 'YPLUS') {
             $quotation = [
                 'low' => 10,

wallet/controllers/UserController.php

@@ -164,6 +164,7 @@ class UserController extends BaseController
         $real_type = Yii::$app->request->get('real_type', '');
         $search_type = Yii::$app->request->get('search_type', 'user');
         $search = Yii::$app->request->get('search', '');
+        $excel = Yii::$app->request->get('excel', '');
         $start_time = Yii::$app->request->get('start_time', '');
         $end_time = Yii::$app->request->get('end_time', '');
         $params = [
@@ -172,6 +173,7 @@ class UserController extends BaseController
             'real_type' => $real_type,
             'search_type' => $search_type,
             'search' => $search,
+            'excel' => $excel,
             'start_time' => $start_time,
             'end_time' => $end_time
         ];