Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-30 f541eaa5c92cb112af6d3f656275105606d31b39

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java

@@ -52,4 +52,10 @@
     */
    Boolean isStrategyPriceConsistent(List<TAccountingStrategyDetail> accountingStrategyDetails);

    /**
     * 通过枪id查询当前时间段计费策略展示
     * @param gunId
     * @return
     */
    List<TAccountingStrategyDetailVO> queryStrategyByGunIdAndTime(Integer gunId);
}