From a8d571b2c1b4881bff496f14e9d07ad1dc556f90 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 05 九月 2025 11:12:01 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyWeekDTO.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyWeekDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyWeekDTO.java index 34c6d56..cf6b5a0 100644 --- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyWeekDTO.java +++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyWeekDTO.java @@ -25,11 +25,15 @@ @ApiModelProperty("study表Id") private String id; - public StudyWeekDTO(Integer week, Integer type, Integer quarter, String title, Integer total) { + @ApiModelProperty("能否进入周目学习") + private Boolean canStudy; + + public StudyWeekDTO(Integer week, Integer type, Integer quarter, String title, Integer total,Boolean canStudy) { super.setWeek(week); super.setType(type); this.quarter = quarter; this.title = title; this.totalIntegral = total; + this.canStudy = canStudy; } } -- Gitblit v1.7.1