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-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
index 9a6652f..8a801fb 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
@@ -11,4 +11,8 @@
private String name;
@ApiModelProperty(value = "可获积分")
private Integer integral;
+ @ApiModelProperty(value = "题目ids 多个逗号隔开")
+ private String subject;
+ @ApiModelProperty(value = "非会员是否可以查看 0否1是")
+ private Integer isVip;
}
\ No newline at end of file
--
Gitblit v1.7.1