From 01dc732d940e81b954685705c32a129473eed951 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 02 七月 2024 10:56:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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