Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-04 b93ccfcab22e5cf28e9145fc75f8756f2c343c26

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

@@ -28,6 +28,8 @@

    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "累计退款金额 前端忽略")
    @TableField(exist = false)

    private BigDecimal refundAmount1;

    @ApiModelProperty(value = "主键")