Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2023-07-19 0ed29a9b6e7cdeeea5f736d5cbe196849b4f22f7

 java110-bean/src/main/java/com/java110/dto/questionAnswer/QuestionAnswerDto.java

@@ -40,9 +40,17 @@

    private long votedCount; // 已投票人数

    private String ownerName;

    private String link;

    private String roomName;

    private List<QuestionTitleValueDto> titleValues;

    private String state;

    private String userQaId;

    public String getQaName() {
        return qaName;
@@ -164,4 +172,36 @@
    public void setState(String state) {
        this.state = state;
    }

    public String getOwnerName() {
        return ownerName;
    }

    public void setOwnerName(String ownerName) {
        this.ownerName = ownerName;
    }

    public String getLink() {
        return link;
    }

    public void setLink(String link) {
        this.link = link;
    }

    public String getRoomName() {
        return roomName;
    }

    public void setRoomName(String roomName) {
        this.roomName = roomName;
    }

    public String getUserQaId() {
        return userQaId;
    }

    public void setUserQaId(String userQaId) {
        this.userQaId = userQaId;
    }
}