From 29c9ada64cee7adf3399e92ee3a62f2b9ed338ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:19:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 89f07a1..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;
/**
* 包邮订单积分
@@ -34,6 +36,6 @@
/**
* 包邮会员等级要求：1普通会员，2黄金会员，3钻石会员，4准代理，5代理，6总代，7合伙人
*/
- @ApiModelProperty(value = "包邮会员等级要求：1普通会员，2黄金会员，3钻石会员，4准代理，5代理，6总代，7合伙人")
- private Integer freeVip;
+ @ApiModelProperty(value = "包邮会员等级要求：0全部 1普通会员，2黄金会员，3钻石会员，4准代理，5代理，6总代，7合伙人")
+ private String freeVip;
}
--
Gitblit v1.7.1