From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
index ae51d2e..df37499 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
@@ -16,7 +16,7 @@
     C3mCharging  getAllByC3Mac(String c3Mac);
 
 
-    List<C3ChargingBo> listC3mChargingDto(String keyword, Long userid);
+    List<C3ChargingBo> listC3mChargingDto(String keyword, Long userid,String orderBy);
 
 
 }

--
Gitblit v1.9.3