From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java
index 98d11ef..a3427fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java
@@ -1,6 +1,7 @@
 package com.panzhihua.common.model.vos.partybuilding;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,19 +15,19 @@
 @Data
 @ApiModel(value = "分页活动人员")
 public class PageActivityMembersVO {
-    @ApiModelProperty(value ="手机号")
+    @ApiModelProperty(value = "手机号")
     private String phone;
-    @ApiModelProperty(value ="姓名")
+    @ApiModelProperty(value = "姓名")
     private String name;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value ="报名时间")
+    @ApiModelProperty(value = "报名时间")
     private String registrationTime;
-    @ApiModelProperty(value ="人员主键")
+    @ApiModelProperty(value = "人员主键")
     private Long id;
-    @ApiModelProperty(value ="当前页数")
+    @ApiModelProperty(value = "当前页数")
     private Long pageNum;
-    @ApiModelProperty(value ="每页记录数")
+    @ApiModelProperty(value = "每页记录数")
     private Long pageSize;
-    @ApiModelProperty(value ="活动id",required = true)
+    @ApiModelProperty(value = "活动id", required = true)
     private Long activityId;
 }

--
Gitblit v1.7.1