From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java
index f32be20..7382643 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.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;
@@ -15,33 +17,40 @@
@Data
public class MgtOrderTotal {
- @ApiModelProperty("订单总数")
+ @ApiModelProperty(value="订单总数")
private Integer orderTotal;
- @ApiModelProperty("订单金额总数")
+ @ApiModelProperty(value="订单金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoneyTotal;
- @ApiModelProperty("门店订单总数")
+ @ApiModelProperty(value="门店订单总数")
private Integer shopOrderTotal;
- @ApiModelProperty("门店订单金额总数")
+ @ApiModelProperty(value="门店订单金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal shopOrderMoneyTotal;
- @ApiModelProperty("门店订单已付金额总数")
+ @ApiModelProperty(value="门店订单已付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal shopPayMoneyTotal;
- @ApiModelProperty("门店订单未付金额总数")
+ @ApiModelProperty(value="门店订单未付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal shopUnPayMoneyTotal;
- @ApiModelProperty("活动订单总数")
+ @ApiModelProperty(value="活动订单总数")
private Integer activityOrderTotal;
- @ApiModelProperty("活动订单金额总数")
+ @ApiModelProperty(value="活动订单金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityOrderMoneyTotal;
- @ApiModelProperty("活动订单已付金额总数")
+ @ApiModelProperty(value="活动订单已付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityPayMoneyTotal;
- @ApiModelProperty("活动订单未付金额总数")
+ @ApiModelProperty(value="活动订单未付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityUnPayMoneyTotal;
}
--
Gitblit v1.7.1