Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-08-10 53eece6b5c6845fd70155a101b2a9e567b59a421

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

@@ -46,6 +46,6 @@
    private BigDecimal serviceAmount;
    // 电站价总金额
    private BigDecimal totalAmount;


    //获得积分
    private Integer point;
}