From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
index 89eb87c..e640c0b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/MallRequest.java
@@ -18,8 +18,15 @@
 
     @ApiModelProperty(value = "商品类型: 1实物 2课包 3门票 4优惠券")
     private Integer goodsType;
+    @ApiModelProperty(value = "门店id")
+    private Integer shopId;
 
     @ApiModelProperty(value = "搜索内容")
     private String search;
 
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize;
 }

--
Gitblit v1.7.1