Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -1106,12 +1106,12 @@ class UserRepository extends BaseRepository
             if ($commission_type == 5 && $award_type == 1) {
                 $cer = Db::name('user')
                     ->where('uid', $user['uid'])
-                    ->field('user_name, phone, user_card')
+                    ->field('real_name, phone, card_id')
                     ->find();
                 $ylj_data_log = [
-                    'user_name' => $cer['user_name'],
+                    'user_name' => $cer['real_name'],
                     "mobile" => $cer['phone'],
-                    "user_card" => $cer['user_card'],//身份证
+                    "user_card" => $cer['card_id'],//身份证
                     "pension" => $num,//养老金
                     "out_trade_no" => '',
                     "account_type" => '',