sove conflict

24ffc563 · shajiaiming · a7e74c03 · 24ffc563
Commit 24ffc563 authored Mar 31, 2020 by shajiaiming
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

AirDropController.php api/controllers/AirDropController.php +1 -1

No files found.
--- a/api/controllers/AirDropController.php
+++ b/api/controllers/AirDropController.php
@@ -105,7 +105,7 @@ class AirDropController extends BaseController
            goto doEnd;
        }
        doEnd :
-        return ['code' => $this->code, 'msg' => $this->msg, 'data' => $this->data];
+        return ['code' => $this->code, 'msg' => $this->msg, 'data' => (int)$this->data];
    }

    public function actionBatchDraw()