Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -1112,13 +1112,16 @@ class UserRepository extends BaseRepository
                     'user_name' => $cer['user_name'],
                     "mobile" => $cer['mobile'],
                     "user_card" => $cer['user_card'],//身份证
-                    "pension" => $num,//养老金额度
-                    "out_trade_no" => null,//订单号
-                    "pay_time" => null,
+                    "pension" => $num,//养老金
+                    "out_trade_no" => '',
+                    "account_type" => '',
+                    "order_type" => 0,
+                    "pay_time" => '',
                     "create_time" => date('Y-m-d H:i:s'),
-                    "update_time" => null,
+                    "update_time" => date('Y-m-d H:i:s'),
                     "uid" => $user['uid'],
                     "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                    "link_id" => ''
                 ];
                 Db::name('gzc_logs')->insert($ylj_data_log);
             }