Merge remote-tracking branch 'origin/master'

xuhy

2024-11-04 c0211a20f4f2d94fe1ac7657284504afa876b8a0

 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 = "主键")