From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java
index 646b368..35b08e6 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java
@@ -2,6 +2,7 @@
 
 import com.matrix.core.tools.StringUtils;
 import com.matrix.system.hive.bean.Answer;
+import com.matrix.system.hive.bean.VipAnswer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -23,7 +24,11 @@
     @ApiModelProperty(value = "类型 1-文本 输入框 2-单选 下拉框 3-多选 多选框 4-长文本 文本域 5-标题 只显示即可")
     private String type;
 
+    @ApiModelProperty(value = "单选、多选的选项")
     private List<Answer> answers;
+
+    @ApiModelProperty(value = "回显答案")
+    private VipAnswer vipAnswer;
 
     public Long getId() {
         return id;
@@ -72,4 +77,12 @@
     public void setAnswers(List<Answer> answers) {
         this.answers = answers;
     }
+
+    public VipAnswer getVipAnswer() {
+        return vipAnswer;
+    }
+
+    public void setVipAnswer(VipAnswer vipAnswer) {
+        this.vipAnswer = vipAnswer;
+    }
 }

--
Gitblit v1.9.1