From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java
index b4fbe3a..0a89bd8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.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,12 +17,12 @@
@TableName(value = "com_act_questnaire_sub")
public class ComActQuestnaireSubDO extends BaseDO implements Serializable {
private static final long serialVersionUID = 914683789736719693L;
- @TableId(type= IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
- * 类型 0单选1多选2问答题
+ * 类型 0 单选 1 多选 2 输入框 2姓名输入框 3 手机号 4 身份证 5 文字描述 6 日期选择
*/
- private int type;
+ private Integer type;
/**
* 题目内容
*/
@@ -33,4 +35,28 @@
* 调查问卷Id
*/
private Long queId;
+
+ /**
+ * 问卷调查题目key
+ */
+ @TableField("`key`")
+ private String key;
+
+ /**
+ * 类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11图片上传
+ */
+ public interface type {
+ int danxuan = 0;
+ int duoxuan = 1;
+ int wenda = 2;
+ int phone = 3;
+ int card = 4;
+ int describe = 5;
+ int date = 6;
+ int time = 7;
+ int input = 8;
+ int name = 9;
+ int imgselect = 10;
+ int imgopload = 11;
+ }
}
--
Gitblit v1.7.1