From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index e2e5750..bd4b2ee 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -23,9 +23,9 @@
     private C3ChargingService c3ChargingService;
 
 
-    @GetMapping("/C3ChargingList")
-    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO) {
-        return ResponseUtil.successPage(c3ChargingService.getC3ChargingList(baseConditionVO));
+    @PostMapping("/C3ChargingList")
+    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
     }
 
     /**

--
Gitblit v1.9.3