From 5c620de6f56977c1e0f3ad461b88c0188d2eeeab Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index d387fe1..ffdb0e4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty("订单编号")
@Excel(name = "订单编号")
private String code;
+ @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
+ @Excel(name = "订单状态", readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
+ private Integer status;
@ApiModelProperty("下单时间")
@Excel(name = "下单时间")
private String createTime;
@@ -31,7 +34,7 @@
@Excel(name = "联系方式")
private String phone;
@ApiModelProperty("商品类型（1=服务，2=单品）")
- @Excel(name = "订单类型", readConverterExp = "1=服务，2=单品")
+ @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
private Integer goodsType;
@ApiModelProperty("支付方式（1=微信，2=余额，3=积分）")
private Integer paymentType;
@@ -40,8 +43,6 @@
private BigDecimal orderMoney;
@ApiModelProperty("订单积分")
private BigDecimal point;
- @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
- private Integer status;
@ApiModelProperty("配送方式（1=自提，2=快递）")
private Integer distributionMode;
@ApiModelProperty("获得分佣")
@@ -57,10 +58,10 @@
@Excel(name = "省")
private String deliverProvince;
// 市
- @Excel(name = "市")
+ @Excel(name = "省区划代码")
private String deliverProvinceCode;
// 省区划代码
- @Excel(name = "省区划代码")
+ @Excel(name = "市")
private String deliverCity;
// 市区划代码
@Excel(name = "市区划代码")
--
Gitblit v1.7.1