From bfb30e542fa76d53297d72dccca47f228987acdd Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 28 二月 2022 16:34:28 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 2167b83..fdf1a4c 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
@@ -29,6 +29,8 @@
     @ApiModelProperty(value = "是否是志愿者 0 不是 1 是")
     private Integer isVolunteer;
 
+    private Integer integralPartyTime;
+
     public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
         this.serviceId = serviceId;
         this.integralType = integralType;

--
Gitblit v1.7.1