From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
index cbede58..6386e95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
@@ -1,12 +1,13 @@
 package com.panzhihua.common.model.dtos.user;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
 import com.panzhihua.common.validated.PageGroup;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,19 +18,25 @@
 @Data
 @ApiModel(value = "意见反馈")
 public class PageFeedBackDTO {
-    @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 nickName;
 
-    @ApiModelProperty(value = "用户名称",example = "")
+    @ApiModelProperty(value = "用户名称", example = "")
     private String name;
+    @ApiModelProperty(value = "手机号", example = "")
+    private String phone;
+
+    private String areaCode;
+
+    private Integer type;
 }

--
Gitblit v1.7.1