Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

d0075838 · lal · c9877d18 · 0238801e · d0075838
Commit d0075838 authored Jun 22, 2020 by lal
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/crm/CrmController.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/crm/CrmController.java
+++ b/src/main/java/cn/timer/api/controller/crm/CrmController.java
@@ -573,7 +573,7 @@ public class CrmController {
 		List<CrmClientData> result = getPageList(crmClientDatas, pageNumber, pageSize,
 				Comparator.comparing(CrmClientData::getCreateTime).reversed());

-		return ResultUtil.pageData(result, (long) result.size(), "查询成功");
+		return ResultUtil.pageData(result, (long) crmClientDatas.size(), "查询成功");
 //		return ResultUtil.data(crmClientDatas, "查询成功");
 	}