From 275047fb889b254078c3780fdfa151a9290a58a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=98=89?= <445241500@qq.com>
Date: Sat, 1 Jun 2024 19:08:20 +0800
Subject: [PATCH] 1

---
 app/api/controller/Category.php | 2 +-
 app/common/model/Merchant.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/Category.php b/app/api/controller/Category.php
index 8b0c773e..643f7d96 100644
--- a/app/api/controller/Category.php
+++ b/app/api/controller/Category.php
@@ -68,7 +68,7 @@ class Category extends Controller
         } else {
             return $this->renderSuccess(compact('list'));
         }
-
+        
         if (!empty($arr)) {
             $arr1 = ['cataIds' => $arr];
         } else {
diff --git a/app/common/model/Merchant.php b/app/common/model/Merchant.php
index 696814df..c712ec56 100644
--- a/app/common/model/Merchant.php
+++ b/app/common/model/Merchant.php
@@ -145,7 +145,7 @@ class Merchant extends BaseModel
      * @param float $money
      * @return mixed
      */
-    public static function setIncTotal(int $merchantId, float $money)
+    public static function setIncTotal(int $merchantId,  $money)
     {
         (new static)->setInc($merchantId, 'total_amount', $money);
         (new static)->setInc($merchantId, 'available_amount', $money);