From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index c62eec7..4ac3c29 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -75,14 +75,14 @@
*/
@PostMapping(value = "/getAllGun")
public R<List<TChargingGun>> getAllGun() {
- return R.ok(chargingGunService.list(null));
+ return R.ok(chargingGunService.list());
}
/**
* 查询所有桩
*/
@PostMapping(value = "/getAllPile")
public R<List<TChargingPile>> getAllPile() {
- return R.ok(chargingPileService.list(null));
+ return R.ok(chargingPileService.list());
}
/**
--
Gitblit v1.7.1