From e4de90990c948898db5d0c2fc080853a144728c3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 13 四月 2022 09:38:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
index 3925f68..8da3286 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.common;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -31,7 +32,7 @@
* 活动id
*/
@ApiModelProperty(value = "活动id")
- private Long acctivityId;
+ private Long activityId;
/**
* 订单id
*/
@@ -60,4 +61,18 @@
@ApiModelProperty(value = "创建时间")
private Date createAt;
+ @ApiModelProperty(value = "已拼人数")
+ private Integer spelledNum;
+
+ @ApiModelProperty(value = "成团人数")
+ private Integer collagePeopleNum;
+
+ @ApiModelProperty(value = "团长头像")
+ private String images;
+
+ @ApiModelProperty(value = "团长昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "拼团人员列表")
+ private List<ComBatteryCommodityOrderCollageTeamPeopleVo> orderCollageTeamPeopleList;
}
--
Gitblit v1.7.1