Merge branch 'master' into develop

# Conflicts: # app/controller/CustomerController.php
2025-04-01 11:15:10 +08:00
parent 2cf5eacfe7 64d294f3c8
commit 3d68efed14
1 changed files with 2 additions and 0 deletions
@@ -140,6 +140,7 @@ class CustomerController
        if (Util::isEmpty($userId)) {
            return Util::fail(['user_id' => $userId], trans('user_none'));
        }
+        $where[] = ['type', 0];
        if($seas == 'seas'){
            $where[] = ['user_id', 0];
        }else{
@@ -586,6 +587,7 @@ class CustomerController
            [
                'user_sn' => $user_sn,
                'uid' => $uid,
+                'type' => 0,
                'channel_id' => $channel_id,
                'country_id' => $country_id,
                'magnitude' => $magnitude,