From 41aba4ebee864a5c8179cab9f43dbd61fe06beb5 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 22 十月 2021 09:51:42 +0800
Subject: [PATCH] Merge branch 'test_integral' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
index 5970963..5fd1e78 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
@@ -11,7 +11,7 @@
     @ApiModelProperty("业务id")
     private Long serviceId;
 
-    @ApiModelProperty("积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)")
+    @ApiModelProperty("积分任务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷)8活动签到")
     private Integer integralType;
 
     @ApiModelProperty(value = "社区id")
@@ -23,6 +23,9 @@
     @ApiModelProperty(value = "是否是评论(1.是 2.否)")
     private Integer isComment;
 
+    @ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
+    private Integer activityType;
+
     public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
         this.serviceId = serviceId;
         this.integralType = integralType;

--
Gitblit v1.7.1