From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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..1394404 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
@@ -5,13 +5,16 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Author: llming
  * @Description: 问卷题目选项
  */
 @Data
 @TableName(value = "com_act_questnaire_sub_selection")
-public class ComActQuestnaireSubSelectionDO extends BaseDO {
+public class ComActQuestnaireSubSelectionDO extends BaseDO implements Serializable {
+    private static final long serialVersionUID = -2083705916360506830L;
     @TableId(type= IdType.AUTO)
     private Long id;
     /**
@@ -19,15 +22,22 @@
      */
     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;
+
 }

--
Gitblit v1.7.1