解决冲突

986a0aea · 王召彬 · 01dbefc1 · 5a5d6b02 · 986a0aea
Commit 986a0aea authored May 10, 2019 by 王召彬
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php
+1 -1

No files found.
--- a/src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php
+++ b/src/LimitTimeBuy/Lib/LimitTimeBuyInterface.php
@@ -83,7 +83,7 @@ interface LimitTimeBuyInterface
        int $status,
        int $orderId);

-         /**
+    /**
     * 获取限时购活动总个数 和正在进行的个数
     *
     * @return mixed