From c0176109caa96cab00d402075e81fa23eb3f85b8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 八月 2023 15:47:22 +0800
Subject: [PATCH] 新增商家端商家类型
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
index a42c51c..d9f9590 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
@@ -1,18 +1,22 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
@Data
@ApiModel("随手拍活动返回参数")
public class ComActEasyPhotoActivityVO {
@ApiModelProperty("活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束 4.已取消）")
@@ -22,11 +26,11 @@
private String content;
@ApiModelProperty("活动开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date activityStartAt;
@ApiModelProperty("活动结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date activityEndAt;
@ApiModelProperty("优质奖励金额")
@@ -38,6 +42,16 @@
@ApiModelProperty("普通奖励金额")
private BigDecimal ordinaryReward;
+ @ApiModelProperty("一般奖励金额")
+ private BigDecimal commonlyReward;
+
@ApiModelProperty("活动图片")
private String logo;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date releaseAt;
+
+ @ApiModelProperty("随手拍参与次数")
+ private Integer count;
}
--
Gitblit v1.7.1