Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-22 fff73372b4b443d2920f09d2e83702fec07521a6

Merge remote-tracking branch 'origin/master'

 src/main/java/com/mindskip/xzs/domain/QuestionAnswer.java

@@ -24,6 +24,8 @@

    private String answer;

    private String attachment;

    private QuestionAnswerStatusEnum status;

    @TableLogic

 src/main/java/com/mindskip/xzs/domain/vo/QuestionAnswerVO.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mindskip.xzs.domain.enums.QuestionAnswerStatusEnum;
import lombok.Data;

import java.io.Serializable;
@@ -20,6 +21,10 @@

    private String answer;

    private String attachment;

    private QuestionAnswerStatusEnum status;

    private Boolean deleted;

    private static final long serialVersionUID = 1L;