From 7b005ca364613c9738dbc66f3e4fe3fb7bec043d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 17 五月 2023 17:02:30 +0800
Subject: [PATCH] demo补完

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java
index c159d1f..1e7d32c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java
@@ -20,5 +20,15 @@
     @ApiModelProperty(value = "搜索关键词")
     private String keyword ;
 
+    @ApiModelProperty(value = "商户进度1.准店铺2.开业中3.停业中")
+    private Integer shopSchedule ;
 
+    @ApiModelProperty(value = "合作开始时间")
+    private String startCooperDate;
+
+    @ApiModelProperty(value = "合作结束时间")
+    private String endCooperDate;
+
+    @ApiModelProperty(value = "商户状态1.正常0.已冻结2.已到期")
+    private Integer shopStatus ;
 }

--
Gitblit v1.7.1