From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java
index 3389f32..7184c63 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java
@@ -39,31 +39,31 @@
private Integer serviceTotal;
@ApiModelProperty(value = "总订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal orderMoney;
@ApiModelProperty(value = "线上订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal onlineMoney;
@ApiModelProperty(value = "线下订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal offlineMoney;
@ApiModelProperty(value = "活动订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal activityMoney;
@ApiModelProperty(value = "周期订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal cycleMoney;
@ApiModelProperty(value = "体验订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal experienceMoney;
@ApiModelProperty(value = "服务订单金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal serviceMoney;
--
Gitblit v1.7.1