From c302fa88eddece608db44bed2b6bb9de135c390e Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 18 四月 2023 18:02:51 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 5 +++++
phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java | 3 ++-
phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
index 76b709c..d4d86fa 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
@@ -26,4 +26,9 @@
private BigDecimal total;
/**鎵�灞炲晢鍝佸垎绫绘爣璇�*/
private List<String> goodsTypeList;
+
+ /**鍗曚釜鍟嗗搧閲戦*/
+ private BigDecimal price;
+ /**璐拱鏁伴噺*/
+ private Integer buyNum;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
index 8c89c62..e007132 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java
@@ -1,5 +1,6 @@
package com.hz.phis.dt.reward;
+import com.alibaba.fastjson.JSONArray;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
@@ -18,6 +19,6 @@
private String code;
private String titleId;
- private List<String> answer;
+ private String[] answer;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
index 79ecbc4..cc8e15a 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/InvestigateTitleDto.java
@@ -1,5 +1,6 @@
package com.hz.phis.dt.reward;
+import com.alibaba.fastjson.JSONArray;
import lombok.Data;
import java.util.List;
@@ -15,6 +16,6 @@
public class InvestigateTitleDto {
private String titleId;
private String title;
- private List<String> answerList;
+ private String[] answerList;
}
--
Gitblit v1.8.0