From 858750b7771d265234efcda4eed3b7f935eeea3c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 17 四月 2023 12:01:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java | 2 ++
phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java | 21 +++++++++++++++++++++
3 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java
new file mode 100644
index 0000000..67ae7e7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateGroupDto.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.reward;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName InvestigateGroupDto
+ * @Description 棰樼粍鏁版嵁
+ * @Author wrh
+ * @Date 2023/4/17 11:53
+ * @Version 1.0
+ */
+@Data
+public class InvestigateGroupDto {
+
+ private String awardId;
+ private String groupId;
+ //棰樼洰鏁版嵁
+ private List<InvestigateTitleDto> titleDtoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
new file mode 100644
index 0000000..79ecbc4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
@@ -0,0 +1,20 @@
+package com.hz.phis.dt.reward;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName InvestigateTitleDto
+ * @Description 棰樼洰鏁版嵁
+ * @Author wrh
+ * @Date 2023/4/17 11:55
+ * @Version 1.0
+ */
+@Data
+public class InvestigateTitleDto {
+ private String titleId;
+ private String title;
+ private List<String> answerList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
index 5eef97f..a9452d4 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/QuestionInvestigateDto.java
@@ -32,4 +32,6 @@
//绛旀鏁版嵁
private List<AnswerDto> answerDtoList;
+
+ private List<InvestigateGroupDto> investigateGroupDtos;
}
--
Gitblit v1.8.0