From 19ab7a4d71420f55777716a8abbbbee548f33bd5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 03 十一月 2022 16:29:13 +0800
Subject: [PATCH] Merge branch 'huacheng_puda' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java | 20 +++++++++++++++++++-
1 files changed, 19 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..c492183 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,21 @@
@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;
+
+ @ApiModelProperty(value = "是否可以参与（1.是 2.否）")
+ private Integer isPartake = 1;
}
--
Gitblit v1.7.1