Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/StaffActivityOrderTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,6 +21,7 @@
    private Integer orderTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "周期订单数")