Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-15 15041c37e21f29bb37acd5efd4ec1b9bba657c65

 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;

}