From 57c8c3c1fd6bd32be6256529210e7818bc25cf6e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 11 Jul 2023 13:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa

---
 screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java
index e6d0df5..fc32589 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java
@@ -18,7 +18,7 @@
 
     private String msg;
 
-    private long page;
+    private long pages;
 
     private long total;
 

--
Gitblit v1.8.0