Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-06-09 f18b35727a11a5f8b5e326f6045f49b571954ba3

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java

@@ -26,10 +26,18 @@
            @Param("req") ChargingListQuery dto,
            @Param("startTime1")String startTime1,
            @Param("startTime2")String startTime2);
    List<ChargingBillListVO> chargingBillListNoLimit(
            @Param("req") ChargingListQuery dto,
            @Param("startTime1")String startTime1,
            @Param("startTime2")String startTime2);
    List<ChargingBillListVO> chargingBillList1(
            @Param("pageInfo") PageInfo<ChargingBillListVO> pageInfo,
            @Param("req") ChargingListQuery dto,
            @Param("startTime1")String startTime1,
            @Param("startTime2")String startTime2);

    List<ChargingBillListVO> chargingBillList1Nolimt(
            @Param("req") ChargingListQuery dto,
            @Param("startTime1")String startTime1,
            @Param("startTime2")String startTime2);
}