From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
index 7e782ae..790702c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
@@ -39,35 +39,35 @@
* 开始时间
*/
@ApiModelProperty(value = "开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@ApiModelProperty(value = "结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date stopTime;
/**
* 开奖时间
*/
@ApiModelProperty(value = "开奖时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date lotteryTime;
/**
* 兑奖开始时间
*/
@ApiModelProperty(value = "兑奖开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date raffleStartTime;
/**
* 兑奖结束时间
*/
@ApiModelProperty(value = "兑奖结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date raffleStopTime;
/**
@@ -131,6 +131,9 @@
@ApiModelProperty(value = "社区id")
private Long communityId;
+ @ApiModelProperty(value = "奖品数量")
+ private Integer prizeCount;
+
@ApiModelProperty(value = "参与人数")
private Integer joinCount;
@@ -141,11 +144,17 @@
private Integer waitRaffleCount;
@ApiModelProperty(value = "创建人名称")
- private Integer createName;
+ private String createName;
@ApiModelProperty(value = "奖品集合")
private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
@ApiModelProperty(value = "中奖情况")
private ComActRaffleRecordVO comActRaffleRecordVO;
+
+ @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
+ private Integer joinStatus;
+
+ @ApiModelProperty("是否参与 0参与 1没参与")
+ private Integer isJoin;
}
--
Gitblit v1.7.1