From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyQuestion.java | 57 ++++++++++++++------------------------------------------- 1 files changed, 14 insertions(+), 43 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyQuestion.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyQuestion.java index 5c40edd..826f80b 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyQuestion.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSurveyQuestion.java @@ -2,6 +2,7 @@ import java.util.List; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -32,9 +33,9 @@ /** * id */ - @ApiModelProperty(value = "涓婚敭id") - @TableId - @JsonSerialize(using = ToStringSerializer.class) +// @ApiModelProperty(value = "涓婚敭id") + @TableId(type = IdType.AUTO) +// @JsonSerialize(using = ToStringSerializer.class) private Long qid; /** @@ -58,6 +59,16 @@ @Excel(name = "鏄惁蹇呭~",dictType="sys_yes_no") private String isRequired; + + private String keywords; + + private String sort; + + private Long mid; + + @TableField(exist = false) + private TjSurveyTemplate template; + /** * 闂嵎閫夐」淇℃伅 */ @@ -65,47 +76,7 @@ @TableField(exist = false) private List<TjSurveyOptions> tjSurveyOptionsList; - public void setQid(Long qid) { - this.qid = qid; - } - public Long getQid() { - return qid; - } - - public void setQuestion(String question) { - this.question = question; - } - - public String getQuestion() { - return question; - } - - public void setType(String type) { - this.type = type; - } - - public String getType() { - return type; - } - - public void setIsRequired(String isRequired) { - this.isRequired = isRequired; - } - - public String getIsRequired() { - return isRequired; - } - - - - public List<TjSurveyOptions> getTjSurveyOptionsList() { - return tjSurveyOptionsList; - } - - public void setTjSurveyOptionsList(List<TjSurveyOptions> tjSurveyOptionsList) { - this.tjSurveyOptionsList = tjSurveyOptionsList; - } @Override public String toString() { -- Gitblit v1.8.0