From a071c70355a0ac580ff124e6fbc4bf4c07d9efb0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 06 八月 2025 12:30:27 +0800 Subject: [PATCH] 所有代码 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java index 0f11713..37a78ef 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java @@ -18,20 +18,20 @@ @ApiModel public class OrderPageList extends BasePage { @ApiModelProperty("订单编号") - public String code; + public String orderNumber; @ApiModelProperty("联系电话") private String phone; @ApiModelProperty("商品名称") - private String goodsName; + private String goodName; @ApiModelProperty("所属店铺") - private Integer shopId; + private String shopName; @ApiModelProperty("支付方式(1=微信,3=积分,4=组合支付)") - private Integer paymentType; + private Integer payMethod; @ApiModelProperty("订单状态(3待使用4已完成5已取消8已评价)") - private Integer status; + private Integer orderStatus; @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -42,4 +42,5 @@ private LocalDateTime endTime; List<Long> appUserIds; + List<Integer> shopIds; } -- Gitblit v1.7.1