From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 051da52..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
@@ -14,11 +14,21 @@
@Data
public class MerAgencyPageDto extends MerPageDto {
- @ApiModelProperty(name = "商户id")
+ @ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty(name = "搜索关键词")
+ @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