Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 7daaf245531a944bf9ea737e8a1c2d6fda51c10c

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

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

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

}