From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java
index dbfd007..1d7c3a0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopOrderPageDto.java
@@ -17,6 +17,9 @@
@ApiModelProperty(value = "关键词")
private String keyword;
+ @ApiModelProperty(value = "订单来源")
+ private Integer orderFrom;
+
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
@@ -38,12 +41,12 @@
@ApiModelProperty(value = "code转换商户ids",hidden = true)
private String shopIds;
- @ApiModelProperty("店铺地址省code")
+ @ApiModelProperty(value="店铺地址省code")
private String shopProvinceCode;
- @ApiModelProperty("店铺地址市code")
+ @ApiModelProperty(value="店铺地址市code")
private String shopCityCode;
- @ApiModelProperty("店铺地址区code")
+ @ApiModelProperty(value="店铺地址区code")
private String shopAreaCode;
}
--
Gitblit v1.7.1