Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-29 e89e19c317ca1b0b4caee20c8d1c172196006624

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TAccountingStrategyMapper.java

@@ -28,7 +28,8 @@
     * @return
     */
    List<TAccountingStrategyVO> pageList(@Param("query") TAccountingStrategyQuery query, @Param("pageInfo")PageInfo<TAccountingStrategyVO> pageInfo);
    
    List<TAccountingStrategyVO> pageList1(@Param("query") TAccountingStrategyQuery query, @Param("pageInfo")PageInfo<TAccountingStrategyVO> pageInfo);

    
    /**
     * 获取平台添加的计费策略