From 8ad5a84a2675d85977cbfb6020f4905f4dd8090a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 15:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
index 0fdfb46..b9a2d7b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
@ApiModel(description = "物流设置")
public class LogisticsSetDto {
@@ -17,13 +19,13 @@
* 订单运费
*/
@ApiModelProperty(value = "订单运费")
- private Integer freight;
+ private BigDecimal freight;
/**
* 包邮订单金额
*/
@ApiModelProperty(value = "包邮订单金额")
- private Integer freeFreight;
+ private BigDecimal freeFreight;
/**
* 包邮订单积分
--
Gitblit v1.7.1