From 79c50faf0fe63640652da7f0c6fe5cae42018872 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 09 九月 2021 09:37:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 05548ae..db2f2c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -92,9 +92,8 @@
@ApiModelProperty("是否二维码签到 1 是 0否")
private Integer isQrCode;
- @ApiModelProperty("用户最近签到时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date activitySignInDate;
+ @ApiModelProperty("用户签到记录列表")
+ private List<ComActActRegistVO> activitySignInList;
@ApiModelProperty("联系人姓名")
private String contactName;
--
Gitblit v1.7.1