解决冲突

9b23989e · shajiaming · 6209a96c · a3e7b8d2 · 9b23989e
Commit 9b23989e authored Feb 21, 2020 by shajiaming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

WalletChainController.php api/controllers/WalletChainController.php +3 -2

No files found.
--- a/api/controllers/WalletChainController.php
+++ b/api/controllers/WalletChainController.php
@@ -38,7 +38,7 @@ class WalletChainController extends BaseController
        $size = Yii::$app->request->get('size', 10);

        $query = CoinPlatformWithHold::find()
-            ->select('id, token, platform, status')
+            ->select('id, token, platform, status, create_time')
            ->where(['wallet_address' => $wallet_address])
            ->orderBy('id');

@@ -206,4 +206,4 @@ class WalletChainController extends BaseController
        $model->platform_id = 1;
        $model->save();
    }
-}
+}
\ No newline at end of file