Merge remote-tracking branch 'origin/master'

puzhibing

2023-09-04 575de116617760027ca38499042918cd09783d12

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java

@@ -591,7 +591,7 @@
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",1)));
            return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",1).orderBy("createTime",false)));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();