From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 3 +++
1 files changed, 3 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..4eb0503 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;
--
Gitblit v1.7.1