From 9c314ed0a45571e16b27dc8ff1a91230d77f0212 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 10 十月 2022 10:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
index 4e07f8c..c4702b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,6 +10,7 @@
@ApiModel("问卷题目选项")
public class ComActQuestnaireSubSelectionVO {
@ApiModelProperty("ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("问题题目ID")
private Long queSubId;
@@ -15,7 +18,7 @@
private String optionName;
@ApiModelProperty("选项内容")
private String content;
- @ApiModelProperty("选项类型 0单选1多选2问答题")
- private String type;
+ @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
+ private Integer type;
}
--
Gitblit v1.7.1