Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-26 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063

 src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java

@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@@ -40,4 +41,7 @@
    private List<OrderItemLocationListDTO> items;

    private String createBy;

    @ApiModelProperty(value = "总金额")
    private BigDecimal totalAmount;
}