Merge remote-tracking branch 'origin/master'

xuhy

2024-09-13 cb02f43ad81fd2ce3e1c3e0cd95234746b7927ad

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

@@ -11,7 +11,7 @@
@ApiModel(value = "TAccountingStrategyDetailVO",description = "计费策略明细")
public class TAccountingStrategyDetailVO extends TAccountingStrategyDetail {

    @ApiModelProperty(value = "原价服务费")
    @ApiModelProperty(value = "总价")
    private BigDecimal totalPrice;

    @ApiModelProperty(value = "会员折扣")