From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
index 8a9e124..9e24d47 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalTestMyTestTopicDTO.java
@@ -12,6 +12,10 @@
 @ApiModel(value = "我的测试-响应参数")
 public class MentalTestMyTestTopicDTO extends MentalTestRecord {
 
+    @ApiModelProperty(value = "题库ID")
+    @ChineseDescription("题库ID")
+    private Long topicId;
+
     @ApiModelProperty(value = "状态:1正常,2冻结")
     @ChineseDescription("状态:1正常,2冻结")
     private Integer topicStatus;
@@ -54,11 +58,11 @@
 
     @ApiModelProperty(value = "是否测试")
     @ChineseDescription("是否测试")
-    private boolean testFlag;
+    private Boolean testFlag;
 
     @ApiModelProperty(value = "是否购买")
     @ChineseDescription("是否购买")
-    private boolean payFlag;
+    private Boolean payFlag;
 
     @ApiModelProperty(value = "测试人数")
     @ChineseDescription("测试人数")

--
Gitblit v1.7.1