From 010f4ba252db180fc7fea4d7cb1b84a0bca7479f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:37:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

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

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
index 116d94e..ae181e6 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java
@@ -40,7 +40,7 @@
         if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
             return null;
         OrganizationQueryVO vo = new OrganizationQueryVO();
-        long page = dto.getPage();
+        long pages = dto.getPages();
         long total = dto.getTotal();
         long current = dto.getCurrent();
         long size = dto.getSize();
@@ -53,7 +53,7 @@
 
         vo.setCurrent(current);
         vo.setOrganizations(organizationVOS);
-        vo.setPages(page);
+        vo.setPages(pages);
         vo.setSize(size);
         vo.setTotal(total);
         return vo;

--
Gitblit v1.8.0