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/dtos/user/PageUserAppletsBackstageDTO.java |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
index bea3579..676a9fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
@@ -1,15 +1,17 @@
 package com.panzhihua.common.model.dtos.user;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.PageGroup;
-import com.panzhihua.common.validated.PutGroup;
-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.NotNull;
-import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.PageGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,45 +23,45 @@
 @ApiModel(value = "运营后台分页查询小程序用户")
 public class PageUserAppletsBackstageDTO {
 
-    @ApiModelProperty(value = "分页-当前页数",example = "1")
-    @NotNull(groups = {PageGroup.class},message = "分页-当前页数不能为空")
-    @Min(groups = {PageGroup.class},value = 1,message = "分页-当前页数不能为空")
+    @ApiModelProperty(value = "分页-当前页数", example = "1")
+    @NotNull(groups = {PageGroup.class}, message = "分页-当前页数不能为空")
+    @Min(groups = {PageGroup.class}, value = 1, message = "分页-当前页数不能为空")
     private Long pageNum;
 
-    @ApiModelProperty(value = "分页-每页记录数",example = "10")
-    @NotNull(groups = {PageGroup.class},message = "分页-每页记录数不能为空")
-    @Min(groups = {PageGroup.class},value = 1,message = "分页-每页记录数不能为空")
+    @ApiModelProperty(value = "分页-每页记录数", example = "10")
+    @NotNull(groups = {PageGroup.class}, message = "分页-每页记录数不能为空")
+    @Min(groups = {PageGroup.class}, value = 1, message = "分页-每页记录数不能为空")
     private Long pageSize;
 
-    @ApiModelProperty(value = "用户手机号",example = "")
+    @ApiModelProperty(value = "用户手机号", example = "")
     private String phone;
 
-    @ApiModelProperty(value = "所属社区",example = "0")
+    @ApiModelProperty(value = "所属社区", example = "0")
     private Long communityId;
 
-    @ApiModelProperty(value = "搜索-注册开始时间",example = "2020-01-02 00:00:00")
+    @ApiModelProperty(value = "搜索-注册开始时间", example = "2020-01-02 00:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAtBegin;
 
-    @ApiModelProperty(value = "搜索-注册结束时间",example = "2020-12-28 00:00:00")
+    @ApiModelProperty(value = "搜索-注册结束时间", example = "2020-12-28 00:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAtEnd;
 
-    @ApiModelProperty(value = "状态 1 启用 2 禁用",example = "0")
-    @NotNull(groups = {PutGroup.class},message = "状态不能为空")
-    @Min(value = 1,groups = {PutGroup.class},message = "状态不能为空")
+    @ApiModelProperty(value = "状态 1 启用 2 禁用", example = "0")
+    @NotNull(groups = {PutGroup.class}, message = "状态不能为空")
+    @Min(value = 1, groups = {PutGroup.class}, message = "状态不能为空")
     private Integer status;
 
-    @ApiModelProperty(value = "搜索-最后登录时间开始",example = "2020-01-02 00:00:00")
+    @ApiModelProperty(value = "搜索-最后登录时间开始", example = "2020-01-02 00:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastLoginTimeBegin;
 
-    @ApiModelProperty(value = "搜索-最后登录时间结束",example = "2020-12-28 00:00:00")
+    @ApiModelProperty(value = "搜索-最后登录时间结束", example = "2020-12-28 00:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastLoginTimeEnd;
 
-    @ApiModelProperty(value = "编辑-用户主键",example = "2")
-    @NotNull(groups = {PutGroup.class},message = "用户主键不能为空")
-    @Min(value = 1,groups = {PutGroup.class},message = "用户主键不能为空")
+    @ApiModelProperty(value = "编辑-用户主键", example = "2")
+    @NotNull(groups = {PutGroup.class}, message = "用户主键不能为空")
+    @Min(value = 1, groups = {PutGroup.class}, message = "用户主键不能为空")
     private Long userId;
 }

--
Gitblit v1.7.1