From 5bc0375793f9187e3d90b7ec6846ab4d8eac5f36 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 14 六月 2024 18:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index d0abc5a..1432c70 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "支付合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消,6 售后")
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中 7=已退款 8=已退款退货")
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@@ -105,7 +105,6 @@
@TableLogic
private Integer delFlag;
-
@ApiModelProperty(value = "快递单号")
private String courierNumber;
@@ -118,10 +117,8 @@
@ApiModelProperty(value = "城市")
private String receiverCity;
-
@ApiModelProperty(value = "详细地址")
private String receiverDetailAddress;
-
@ApiModelProperty(value = "保证金")
private BigDecimal bound;
@@ -147,5 +144,7 @@
@ApiModelProperty(value = "积分")
private Integer points;
+ @ApiModelProperty("发货快递")
+ private String logisticsNum;
}
--
Gitblit v1.7.1