From 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev

---
 java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java |   97 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java b/java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java
index 4c08940..13d90ee 100644
--- a/java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/user/UserQuestionAnswerDto.java
@@ -1,8 +1,10 @@
 package com.java110.dto.user;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -17,80 +19,103 @@
     public static final String STATE_WAIT = "1201";//1201 寰呭鐞� 1202 瀹屾垚
     public static final String STATE_FINISH = "1202";//1201 寰呭鐞� 1202 瀹屾垚
     private String score;
-private String ownerName;
-private String link;
-private String userQaId;
-private String state;
-private String ownerId;
-private String communityId;
-private String roomId;
-private String roomName;
-private String qaId;
+    private String ownerName;
+    private String link;
+    private String userQaId;
+    private String state;
+    private String ownerId;
+    private String communityId;
+    private String roomId;
+    private String roomName;
+    private String qaId;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private String qaType;
+
+    private List<UserQuestionAnswerValueDto> values;
+
 
     public String getScore() {
         return score;
     }
-public void setScore(String score) {
+
+    public void setScore(String score) {
         this.score = score;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getLink() {
+
+    public String getLink() {
         return link;
     }
-public void setLink(String link) {
+
+    public void setLink(String link) {
         this.link = link;
     }
-public String getUserQaId() {
+
+    public String getUserQaId() {
         return userQaId;
     }
-public void setUserQaId(String userQaId) {
+
+    public void setUserQaId(String userQaId) {
         this.userQaId = userQaId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getRoomName() {
+
+    public String getRoomName() {
         return roomName;
     }
-public void setRoomName(String roomName) {
+
+    public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
-public String getQaId() {
+
+    public String getQaId() {
         return qaId;
     }
-public void setQaId(String qaId) {
+
+    public void setQaId(String qaId) {
         this.qaId = qaId;
     }
 
@@ -110,4 +135,20 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<UserQuestionAnswerValueDto> getValues() {
+        return values;
+    }
+
+    public void setValues(List<UserQuestionAnswerValueDto> values) {
+        this.values = values;
+    }
+
+    public String getQaType() {
+        return qaType;
+    }
+
+    public void setQaType(String qaType) {
+        this.qaType = qaType;
+    }
 }

--
Gitblit v1.8.0