From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
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