From 3eac3116ce54c2593f09a74feed370cf0800028e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 21:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index 4efccf5..72e4204 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -42,6 +42,10 @@
@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
@TableField("order_status")
private Integer orderStatus;
+
+ @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
+ @TableField("old_order_status")
+ private Integer oldOrderStatus;
@ApiModelProperty(value = "是否已分佣: 0-否 1-是")
@TableField("is_commission")
@@ -146,6 +150,30 @@
@ApiModelProperty(value = "第三方快递结果")
@TableField("express_result")
private String expressResult;
+
+ @ApiModelProperty(value = "发货省")
+ @TableField("deliver_province")
+ private String deliverProvince;
+
+ @ApiModelProperty(value = "发货省编号")
+ @TableField("deliver_province_code")
+ private String deliverProvinceCode;
+
+ @ApiModelProperty(value = "发货市")
+ @TableField("deliver_city")
+ private String deliverCity;
+
+ @ApiModelProperty(value = "发货市编号")
+ @TableField("deliver_city_code")
+ private String deliverCityCode;
+
+ @ApiModelProperty(value = "发货区")
+ @TableField("deliver_district")
+ private String deliverDistrict;
+
+ @ApiModelProperty(value = "发货区编号")
+ @TableField("deliver_district_code")
+ private String deliverDistrictCode;
@ApiModelProperty(value = "收货地址信息")
@TableField("address_json")
--
Gitblit v1.7.1