From 1f649d3a2a7b631b71d16bcc046c3c6c32c2ecbf Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 14:51:49 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 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 2f4b101..eabd962 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,11 +1,13 @@
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;
-import java.io.Serializable;
+import lombok.Data;
/**
* @Author: llming
@@ -15,7 +17,7 @@
@TableName(value = "com_act_questnaire_sub_selection")
public class ComActQuestnaireSubSelectionDO extends BaseDO implements Serializable {
private static final long serialVersionUID = -2083705916360506830L;
- @TableId(type= IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 问卷题目Id
@@ -26,11 +28,34 @@
*/
private Integer sort;
/**
- * 选项名
- */
- private String optionName;
- /**
* 选项内容
*/
private String content;
+
+ /**
+ * 选项名
+ */
+ private String optionName;
+
+ /**
+ * 选项类型 0 固定选项 1 自定义选项
+ */
+ private Integer type;
+
+ /**
+ * 问卷调查Id
+ */
+ private Long queId;
+
+ /**
+ * 问卷调查选项key
+ */
+ @TableField("`key`")
+ private String key;
+
+ /**
+ * 组件文件上传保存路径
+ */
+ private String url;
+
}
--
Gitblit v1.7.1