From 981aacc8d5de2638a0f5b3eb2585e64cfaf2807d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 七月 2025 18:01:19 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 7aefc43..2060ffb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -46,6 +46,9 @@
     @ApiModelProperty(value="商品数量")
     private Integer goodsNum;
 
+    @ApiModelProperty(value="核销商户类型(0=全部店铺,1=部分商户,2=单个商户)")
+    private Integer shopNumber;
+
     @ApiModelProperty(value="商户id")
     private Long shopId;
 
@@ -72,6 +75,9 @@
     @ApiModelProperty(value = "查询关键字", hidden = true)
     @JsonIgnore
     private String keyword;
+    
+    @ApiModelProperty(value="取消方(1=平台,2=商户,3=用户)")
+    private Integer cancelType;
 
 
 }

--
Gitblit v1.7.1