From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 ff5e447..df1f198 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,18 +19,24 @@
@ApiModel("社区活动签到表")
public class ComActActRegistExcelVO {
- @ExcelProperty(value = "姓名", index = 1)
+ @ExcelProperty(value = "姓名", index = 3)
private String name;
- @ExcelProperty(value = "身份", index = 2)
+ @ExcelProperty(value = "身份", index = 4)
private String identity;
- @ExcelProperty(value = "电话", index = 4)
+ @ExcelProperty(value = "电话", index = 6)
private String phone;
- @ExcelProperty(value = "签到时间（未签到就是报名时间）", index = 0)
+ @ExcelProperty(value = "签到时间", index = 0)
private Date createAt;
- @ExcelProperty(value = "人群标签", index = 3)
+ @ExcelProperty(value = "人群标签", index = 5)
private String tags;
+
+ @ExcelProperty(value = "签到地点", index = 1)
+ private String position;
+
+ @ExcelProperty(value = "签到次数", index = 2)
+ private Integer times;
}
\ No newline at end of file
--
Gitblit v1.7.1