From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
index 0a7f49c..97a5981 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
@@ -1,8 +1,12 @@
package com.panzhihua.service_community.model.dos;
+import java.io.Serializable;
+
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+
import lombok.Data;
/**
@@ -11,23 +15,42 @@
*/
@Data
@TableName(value = "com_act_questnaire_sub_selection")
-public class ComActQuestnaireSubSelectionDO extends BaseDO {
- @TableId(type= IdType.AUTO)
+public class ComActQuestnaireSubSelectionDO extends BaseDO implements Serializable {
+ private static final long serialVersionUID = -2083705916360506830L;
+ @TableId(type = IdType.AUTO)
private Long id;
/**
* 问卷题目Id
*/
private Long queSubId;
/**
- * 选项类型 0单选1多选2问答题
- */
- private int type;
- /**
* 选项排序
*/
- private int sort;
+ private Integer sort;
/**
* 选项内容
*/
private String content;
+
+ /**
+ * 选项名
+ */
+ private String optionName;
+
+ /**
+ * 选项类型 0 固定选项 1 自定义选项
+ */
+ private Integer type;
+
+ /**
+ * 问卷调查Id
+ */
+ private Long queId;
+
+ /**
+ * 问卷调查选项key
+ */
+ @TableField("`key`")
+ private String key;
+
}
--
Gitblit v1.7.1