Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-08 66794a3e6b3feb01d4b6ae5710a0725b525a99dd

 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;

}