From 63fbcaddd902bc4ab65e17b9dfe98118474c5c1a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 03 八月 2023 19:14:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
index b05332d..34b91f8 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
@@ -1,8 +1,11 @@
 package com.hz.phis.dt.reward;
 
+import com.alibaba.fastjson.JSONArray;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
 import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import lombok.Data;
+
+import java.util.List;
 
 /**
  * @ClassName AwardDto
@@ -16,6 +19,7 @@
 
     private String code;
     private String titleId;
-    private String answer;
+    private String title;
+    private String[] answer;
 
 }

--
Gitblit v1.8.0