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/TStudy.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudy.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudy.java
index 4701f77..2a61d55 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudy.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudy.java
@@ -39,4 +39,8 @@
* 本周主题
*/
private String title;
+ /**
+ * 1一季度2二季度3三季度4四季度
+ */
+ private Integer quarter;
}
--
Gitblit v1.7.1