From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
index 7ef1c43..fe1357d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
@@ -12,8 +12,10 @@
 public class QRActivityCodeVO {
     @ApiModelProperty("数据主键id")
     private Integer id;
-    @ApiModelProperty("二维码类型 1居民,志愿者 2党员")
+    @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
     private Integer type;
     @ApiModelProperty(value = "二维码id",example = "1")
     private Long codeId;
+    @ApiModelProperty("签到类型 1签到 2签退")
+    private Integer signType;
 }

--
Gitblit v1.7.1