feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 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;
}