Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinE...

无关风月

2024-06-18 610604ea8fbdc1f2b0f54e90a689b9ff449f092c

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -1503,8 +1503,8 @@
            @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<TIntegralRecord>> integralDetailParent(String time,
                                                          @RequestParam("pageNum") Integer pageNum,
                                                          @RequestParam("pageSize") Integer pageSize) {
                                                          Integer pageNum,
                                                          Integer pageSize) {
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }