From 65862c0f9d9449937cf17151d9462f25b3a49474 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 26 七月 2023 09:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index e5d62c5..f4ca4a2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -84,7 +84,7 @@
}
}
- return R.ok(cstmrService.getPage2(new Page<>(curr, limit)
+ return R.ok(cstmrService.getPage1(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
--
Gitblit v1.9.1