From 3389e27613953cf3d7d06653139bf902e08736dc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 22 十月 2021 13:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
index a42430e..29bb739 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
@@ -65,4 +65,19 @@
 
     @ApiModelProperty(value = "分页-每页记录数", example = "10")
     private Long pageSize = 10L;
+
+    @ApiModelProperty(value = "签到位置")
+    private String position;
+
+    @ApiModelProperty(value = "签到次数")
+    private Integer times;
+
+    @ApiModelProperty(value = "二维码id")
+    private Integer codeId;
+
+    @ApiModelProperty(value = "本次签到获取的积分奖励")
+    private Integer award;
+
+    @ApiModelProperty(value = "活动类型 1居民,志愿者 2党员")
+    private Integer activityType;
 }
\ No newline at end of file

--
Gitblit v1.7.1