From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
index 781676c..d07db64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -16,10 +16,12 @@
@ApiModelProperty("活动主键")
private Long activityId;
- @ApiModelProperty("人员主键")
+ @ApiModelProperty("表主键")
private Long id;
@ApiModelProperty("名字")
private String name;
+ @ApiModelProperty("用户昵称")
+ private String nickName;
@ApiModelProperty("身份")
private String identity;
@ApiModelProperty("手机号")
@@ -28,4 +30,14 @@
private String createAt;
@ApiModelProperty("人员头像")
private String imageUrl;
+ @ApiModelProperty(value = "是否是志愿者",hidden = true)
+ private Integer isVolunteer;
+ @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者",hidden = true)
+ private Integer type;
+ @ApiModelProperty("人员主键")
+ private Long userId;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
}
--
Gitblit v1.7.1