Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-31 2e43d137c7832e149f3df4145aa7fcca2153ef9c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -10,6 +10,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderRefund;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.*;
@@ -112,4 +113,6 @@
   List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);

   List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);
}