From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java
new file mode 100644
index 0000000..822e56e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java
@@ -0,0 +1,107 @@
+package com.matrix.system.activity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ActivitiesListVo {
+	
+	/**
+	 * 活动类型 团购
+	 */
+	public static final int ACTIVITIES_TYPE_GROUP = 1;
+
+	/**
+	 * 活动类型 秒杀
+	 */
+	public static final int ACTIVITIES_TYPE_SECKILL = 2;
+
+	/**
+	 * 活动类型 沙龙
+	 */
+	public static final int ACTIVITIES_TYPE_SALON = 3;
+	/**
+	 * 活动类型 签到
+	 */
+	public static final int ACTIVITIES_TYPE_SIGN = 4;
+
+	/**
+	 * 活动状态 开启
+	 */
+	public static final int ACTIVITIES_STATUS_OPEN = 1;
+
+	/**
+	 * 活动状态 关闭
+	 */
+	public static final int ACTIVITIES_STATUS_CLOSE = 2;
+	/**
+	 * 主键
+	 */
+	private Long  id;
+			
+	
+	/**
+	 * 活动名称
+	 */
+	@ApiModelProperty(value = "活动名称")
+	private String  actName;
+	/**
+	 * 活动编码
+	 */
+	@ApiModelProperty(value = "活动编码")
+	private String  actCode;
+			
+	
+	/**
+	 * 活动类型
+	 */
+	@ApiModelProperty(value = "活动类型")
+	private Integer  actType;
+			
+	
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value = "开始时间")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+	private Date actBeginTime;
+			
+	
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value = "结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+	private Date  actEndTime;
+	/**
+	 * 活动状态
+	 */
+	@ApiModelProperty(value = "活动状态")
+	private Integer  actStatus;
+
+	//未发布
+	public static final int ACTSTATUS_STATUS_RELEASE = 1;
+	//未开始
+	public static final int ACTSTATUS_STATUS_READY = 2;
+	//进行中
+	public static final int ACTSTATUS_STATUS_ING = 3;
+	//已结束
+	public static final int ACTSTATUS_STATUS_END = 4;
+	@ApiModelProperty(value = "创建人")
+	private String  createBy;
+	/**
+	 * 活动说明
+	 */
+	@ApiModelProperty(value = "活动说明")
+	private String  actRemark;
+	
+	/**
+	 * 公司ID
+	 */
+	@ApiModelProperty(hidden = true)
+	private Long  companyId;
+
+}

--
Gitblit v1.9.1