From e60f6e849f43cb894fb96646de71304cf2524827 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 14:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/common/bean/PageBean.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/PageBean.java b/src/main/java/com/moral/common/bean/PageBean.java
index 0232fbe..01a6f9f 100644
--- a/src/main/java/com/moral/common/bean/PageBean.java
+++ b/src/main/java/com/moral/common/bean/PageBean.java
@@ -45,6 +45,7 @@
this.size = page.size();
}else{
this.data = list;
+ this.total = Integer.toUnsignedLong(list.size());
}
}
--
Gitblit v1.8.0