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/community/bigscreen/PageBigScreenStatisticPartyOrg.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java
index 8b75778..3b51b51 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java
@@ -1,10 +1,10 @@
 package com.panzhihua.common.model.dtos.community.bigscreen;
 
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @ClasssName PageBigScreenStatisticPartyOrg
@@ -24,14 +24,14 @@
     private Long pageSize = 50L;
 
     @ApiModelProperty(value = "排序字段, 默认id", hidden = true, example = "id")
-    private String sortBy="id";
+    private String sortBy = "id";
 
     @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
     @Pattern(regexp = "asc|desc|ASC|DESC")
-    private String order="desc";
+    private String order = "desc";
 
     @ApiModelProperty(value = "社区id", hidden = true, example = "2")
-    //@NotNull(message = "社区id不能为空")
+    // @NotNull(message = "社区id不能为空")
     private Long communityId;
 
 }

--
Gitblit v1.7.1