From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
index 03be866..e54d7f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -1,13 +1,16 @@
package com.panzhihua.common.model.vos.community;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -23,35 +26,36 @@
private Long id;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("状态：1- 申请；2 - 通过；3 - 驳回")
private Integer state;
@ApiModelProperty("姓名")
- @NotBlank(groups = {AddGroup.class},message = "姓名不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
private String name;
@ApiModelProperty("电话号码")
private String phone;
@ApiModelProperty("照片路径")
- @NotBlank(groups = {AddGroup.class},message = "照片不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "照片不能为空")
private String photoPath;
@ApiModelProperty("政治面貌：1 - 党员；2- 团员；3 - 群众")
- @Min(value = 1,groups = {AddGroup.class},message = "政治面貌不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "政治面貌不能为空")
private Integer politicalFace;
@ApiModelProperty("拒绝原因")
private String rejectReson;
@ApiModelProperty("申请原因")
- @NotBlank(groups = {AddGroup.class},message = "申请原因不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "申请原因不能为空")
private String applyReson;
@ApiModelProperty("居住地址")
- @NotBlank(groups = {AddGroup.class},message = "居住地址不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "居住地址不能为空")
private String address;
@ApiModelProperty("当前页数")
@@ -60,11 +64,24 @@
@ApiModelProperty("每页记录数")
private Long pageSize;
- @ApiModelProperty(value = "年龄",example = "15")
- @Min(value = 1,groups = {AddGroup.class},message = "年龄不能为空")
+ @ApiModelProperty(value = "年龄", example = "15")
+ @Min(value = 1, groups = {AddGroup.class}, message = "年龄不能为空")
private Integer age;
- @ApiModelProperty(value = "职业",example = "家庭主妇")
- @NotBlank(groups = {AddGroup.class},message = "职业不能为空")
+ @ApiModelProperty(value = "职业", example = "家庭主妇")
+ @NotBlank(groups = {AddGroup.class}, message = "职业不能为空")
private String job;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "积分", hidden = true)
+ private Integer integral;
+
+ @ApiModelProperty(value = "用户userid", hidden = true)
+ @Deprecated
+ private Long userId;
+
+ @ApiModelProperty(value = "申请提交人ID", hidden = true)
+ private Long submitUserId;
}
--
Gitblit v1.7.1