Merge branch 'order' into test

modules/User/Models/User.php

@@ -93,20 +93,10 @@ class User extends Model implements AuthenticatableContract
      */
     public function updateBy($id, array $data): mixed
     {
-        if (isset($data['password'])) {
-            if (empty($data['password'])) {
-                if (isset($data['password'])) {
-                    unset($data['password']);
-                }
-            } else {
-                $data['password'] = bcrypt($data['password']);
-            }
-        } else{
-            if (isset($data['password'])){
-                unset($data['password']);
-            }
+        if(getProp($data,'password')){
+            User::query()->where('id',$id)->update(['password' => bcrypt($data['password'])]);
+            unset($data['password']);
         }
-
         return parent::updateBy($id, $data);
     }