From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
index 3a64229..5a903a2 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java
@@ -4,20 +4,12 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
-
@Data
@ApiModel(value = "ActivitySignRecordVo", description = "签到明细")
public class ActivitySignRecordVo {
- /**
- * userId
- */
-
-
- @ApiModelProperty(value ="userId")
- private Long userId;
-
+ @ApiModelProperty(value ="签到状态 1：已签到 2：未签到")
+ private int state;
/**
* 签到时间
*/
@@ -25,16 +17,7 @@
@ApiModelProperty(value ="签到时间")
- private Date signTime;
-
- /**
- * 累计签到天数
- */
-
-
-
- @ApiModelProperty(value ="累计签到天数")
- private Integer cumulativeDay;
+ private String signTime;
/**
* 活动主表ID
--
Gitblit v1.9.1