From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 cf03b27..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
@@ -6,7 +6,7 @@
/**
* @ClassName OrganizationQueryDTO
- * @Description TODO
+ * @Description ���������������������������������������������
* @Author ���������
* @Date 2021/3/25 16:10
* @Version TODO
@@ -18,7 +18,7 @@
private String msg;
- private long page;
+ private long pages;
private long total;
--
Gitblit v1.8.0