From 8ee3531169978ab1acf0b8bfb12ec22b3d828a56 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 09:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
index 68be13f..9024125 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
@@ -26,6 +26,11 @@
 @ApiModel("查询事件请求参数")
 public class PageEventDTO {
 
+    @Max(9223372036854775807L)
+    @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
+    @NotNull
+    private Long gridId;
+
     @ApiModelProperty(value = "分页-当前页数", example = "1")
     private Long pageNum = 1L;
 
@@ -68,11 +73,6 @@
     @Max(9223372036854775807L)
     @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
     private Long gridMemberCommunity;
-
-
-    @Max(9223372036854775807L)
-    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
-    private Long gridId;
 
 
     @Max(9223372036854775807L)

--
Gitblit v1.7.1