From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jan 2021 11:25:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java
index 1f0d0a7..59ef975 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java
@@ -1,12 +1,14 @@
package com.xcong.excoin.modules.documentary.vo;
+import java.util.List;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "TradeSetInfoVo", description = "返回类")
-public class TradeSetInfoVo {
+public class TradeSetInfoVo<FollowTraderLabelEntity> {
@ApiModelProperty(value = "交易员ID")
private Long tradeId;
@@ -24,7 +26,7 @@
private String declaration;
@ApiModelProperty("标签")
- private String labels;
+ private List<FollowTraderLabelEntity> FollowTraderLabelEntitys;
--
Gitblit v1.9.1