From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
index dff0b54..633c01b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.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;
@@ -22,22 +20,17 @@
private Integer orderTotal;
@ApiModelProperty(value = "应收金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value = "实收金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal relReceiveMoney;
@ApiModelProperty(value = "已收金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal relPayMoney;
@ApiModelProperty(value = "未收金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unpaidMoney;
- @ApiModelProperty(value = "总订金")
- @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "订金")
private BigDecimal receivableDeposit;
}
--
Gitblit v1.7.1