From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
index df1f198..db670b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
@@ -19,24 +19,27 @@
@ApiModel("社区活动签到表")
public class ComActActRegistExcelVO {
- @ExcelProperty(value = "姓名", index = 3)
+ @ExcelProperty(value = "姓名", index = 4)
private String name;
- @ExcelProperty(value = "身份", index = 4)
+ @ExcelProperty(value = "身份", index = 5)
private String identity;
- @ExcelProperty(value = "电话", index = 6)
+ @ExcelProperty(value = "电话", index = 7)
private String phone;
@ExcelProperty(value = "签到时间", index = 0)
- private Date createAt;
+ private Date startTime;
- @ExcelProperty(value = "人群标签", index = 5)
+ @ExcelProperty(value = "签退时间", index = 1)
+ private Date endTime;
+
+ @ExcelProperty(value = "人群标签", index = 6)
private String tags;
- @ExcelProperty(value = "签到地点", index = 1)
+ @ExcelProperty(value = "签到地点", index = 2)
private String position;
- @ExcelProperty(value = "签到次数", index = 2)
+ @ExcelProperty(value = "签到次数", index = 3)
private Integer times;
}
\ No newline at end of file
--
Gitblit v1.7.1