Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-09 d5d181b911b6de2935fe14249ef958344c3fbf40

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/StrategyPriceVO.java

@@ -23,4 +23,7 @@
    @ApiModelProperty(value = "服务费折扣")
    private BigDecimal serviceFeeDiscount;

    @ApiModelProperty(value = "折扣")
    private BigDecimal discount;

}