From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 8d3722e..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;
@@ -23,6 +25,9 @@
 	@ApiModelProperty("宣言")
 	private String declaration;
 	
+	@ApiModelProperty("标签")
+	private List<FollowTraderLabelEntity> FollowTraderLabelEntitys;
+	
 	
 
 }

--
Gitblit v1.9.1