From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 8a2c157..c5ee7ad 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=已取消")
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@@ -126,6 +126,8 @@
@ApiModelProperty(value = "保证金")
private BigDecimal bound;
+ @ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
+ private Integer invoiceStatus;
}
--
Gitblit v1.7.1