From 3d357cce580997b5c4c293000d26c2823207eaea Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 11:09:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index ee866d2..436a6d1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -28,7 +28,7 @@
public interface OtherClient {
//单位分页
- @PostMapping(value = "/t-invoice-type/t-company/unit/page")
+ @PostMapping(value = "/t-company/unit/page")
R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
//单位添加修改
@PostMapping(value = "/t-company/unit/addOrUpdate")
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
index caa9314..1a162d4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
@@ -23,9 +23,9 @@
private Integer pageSize = 10;
public Integer getPageCurr() {
- if(null != pageCurr){
- pageCurr = (pageCurr - 1) * pageSize;
- }
+// if(null != pageCurr){
+// pageCurr = (pageCurr - 1) * pageSize;
+// }
return pageCurr;
}
--
Gitblit v1.7.1