Merge branch 'worker_0609'

app/workerapi/logic/AccountLogic.php

@@ -31,7 +31,7 @@ class AccountLogic extends BaseLogic
             if ($masterWorker->type == 2) {
                 return ['user_money' =>"-",'account_yesterday' => "-",'case_out_money' => "-"];
             }
-            $data['user_money'] = $masterWorker && $masterWorker->user_money ?? 0;
+            $data['user_money'] = $masterWorker && $masterWorker->user_money ? $masterWorker->user_money : 0;
             $where = [];
             $where[] = ['worker_id','=',$params['worker_id']] ;
             $where[] = ['change_type', '=', WorkerAccountLogEnum::UM_INC_ADMIN];