From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
index d23ecc1..6ab9508 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudy.java
@@ -43,23 +43,28 @@
* 所属周目
*/
@ApiModelProperty(value = "所属周目")
- private Integer week;/**
+ private Integer week;
+ /**
* 故事名称
*/
@ApiModelProperty(value = "学习进度dayXX")
- private Integer day;/**
+ private Integer day;
+ /**
* 故事名称
*/
@ApiModelProperty(value = "总学习时长 单位小时")
- private Integer totalStudy;/**
+ private Integer totalStudy;
+ /**
* 故事名称
*/
@ApiModelProperty(value = "今日学习时长 单位小时")
- private Integer todayStudy;/**
+ private Integer todayStudy;
+ /**
* 故事名称
*/
@ApiModelProperty(value = "本周学习时长")
- private Integer weekStudy;/**
+ private Integer weekStudy;
+ /**
* 故事名称
*/
@ApiModelProperty(value = "本月学习时长")
--
Gitblit v1.7.1