From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 11:27:47 +0800 Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java index 4a255ef..f954386 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java @@ -2,6 +2,7 @@ import java.math.BigDecimal; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -136,5 +137,30 @@ private Long specsId; @ApiModelProperty(value = "商户规格名称") - private Long specsName; + private String specsName; + + @ApiModelProperty(value = "活动已卖出数量") + private Integer commoditySaleNum; + + @ApiModelProperty(value = "是否可以开团(1.是 2.否)") + private Integer isOpen = 1; + + @ApiModelProperty(value = "团队id") + private Long teamId; + + @ApiModelProperty(value = "拼团结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date teamEndTime; + + @ApiModelProperty(value = "是否可以砍价(1.是 2.否)") + private Integer isBargain = 1; + + @ApiModelProperty(value = "砍价记录id") + private Long bargainId; + + @ApiModelProperty(value = "砍价结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date bargainEndTime; } -- Gitblit v1.7.1