Merge remote-tracking branch 'origin/master'

mitao

2024-03-06 51527a6e817a6ba73b29b07e94a7e879a86f8eaf

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

@@ -1,7 +1,5 @@
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;

@@ -24,7 +22,6 @@
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单金额value")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal[] orderMoneyValue;