Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 b4b44f2021dbf083b7057fb7e192b72d08b4bf17

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java

@@ -73,7 +73,7 @@
    @TableField("period_electric_price")
    private BigDecimal periodElectricPrice;

    @ApiModelProperty(value = "时段服务费")
    @ApiModelProperty(value = "时段服务费(最终服务费 含折扣)")
    @TableField("period_service_price")
    private BigDecimal periodServicePrice;
    
@@ -93,9 +93,7 @@
    @TableField(exist = false)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "最终服务费")
    @TableField(exist = false)
    private BigDecimal finalService;



}