Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -3143,7 +3143,7 @@ class UserRepository extends BaseRepository
                 Db::name("rrx_user_spread_change_records")->insert([
                     'operation_id' => $adminId,
                     'uid' => $uid,
-                    'old_spread_id' => $identity['spread_uid'],
+                    'old_spread_id' => $spreadId,
                     'new_spread_id' => $spread['uid'],
                     'mark' => $mark ]);
                 Db::name("user")->where('account',$spread_account)->inc("spread_count",1)->update();

app/controller/admin/user/User.php

@@ -2039,7 +2039,7 @@ class User extends BaseController
                 $records->where('uid', $uid);
             }
             $query=$records
-            ->order('r.create_time DESC')
+            ->order('create_time DESC')
             ->paginate(20)
             ->toArray();
         return app('json')->success($query, '获取成功');
@@ -2053,7 +2053,7 @@ class User extends BaseController
             $records->where('uid', $uid);
         }
         $query=$records
-            ->order('r.create_time DESC')
+            ->order('create_time DESC')
             ->paginate(20)
             ->toArray();
         return app('json')->success($query, '获取成功');
@@ -2067,7 +2067,7 @@ class User extends BaseController
             $records->where('uid', $uid);
         }
         $query=$records
-            ->order('r.create_time DESC')
+            ->order('create_time DESC')
             ->paginate(20)
             ->toArray();
         return app('json')->success($query, '获取成功');

route/admin.php

@@ -407,10 +407,10 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
             Route::get('enterpriseUserScoreApi', '/enterpriseUserScoreApi')->name('enterpriseUserScoreApi');
             //获取用户操作记录
-            Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');
             Route::get('getUserIdentityChangeRecord', '/getUserIdentityChangeRecord')->name('getUserIdentityChangeRecord');//身份修改
-            Route::get('getUserSpreadChangeRecord','getUserSpreadChangeRecord')->name('getUserSpreadChangeRecord');//推荐人修改
-            Route::get('getUserLevelChangeRecord','getUserLevelChangeRecord')->name('getUserLevelChangeRecord');//节点人修改
+            Route::get('getUserSpreadChangeRecord','/getUserSpreadChangeRecord')->name('getUserSpreadChangeRecord');//推荐人修改
+            Route::get('getUserLevelChangeRecord','/getUserLevelChangeRecord')->name('getUserLevelChangeRecord');//节点人修改
+            Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');