From b879982d29cb2dbfe72482b46c8f6f2064d663a2 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 15:27:29 +0800
Subject: [PATCH] 支付调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
index c5afb5d..8638fe9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
@@ -1,11 +1,8 @@
package com.ruoyi.shop.domain.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @author jqs34
@@ -16,6 +13,9 @@
*/
@Data
public class MgtShopPageDto extends MgtPageDto {
+
+ @ApiModelProperty(value = "商户类型1经销商2代理商")
+ private Integer shopType ;
@ApiModelProperty(value = "搜索关键词")
private String keyword ;
@@ -29,8 +29,11 @@
@ApiModelProperty(value = "店铺地址区code")
private String shopAreaCode;
- @ApiModelProperty(value = "签约时间")
- private Date signTime;
+ @ApiModelProperty(value = "签约开始时间")
+ private String signStartTime;
+
+ @ApiModelProperty(value = "签约结束时间")
+ private String signEndTime;
@ApiModelProperty(value = "签约省code")
private String signProvinceCode;
@@ -50,6 +53,9 @@
@ApiModelProperty(value = "归属员工")
private Long belongUserId;
+ @ApiModelProperty(value = "归属经销商id")
+ private Long belongShopId;
+
@ApiModelProperty(value = "来源渠道")
private String shopSource;
@@ -59,7 +65,7 @@
@ApiModelProperty(value = "到期标记")
private Integer expireFlag;
- @ApiModelProperty(value = "商户标签")
+ @ApiModelProperty(value = "商户标签 多个,隔开")
private String shopTags;
@ApiModelProperty(value = "扶持能力1.有2.没有")
@@ -83,6 +89,7 @@
@ApiModelProperty(value = "与合作商关系1.好2.差")
private Integer relationPartner;
-
+ @ApiModelProperty(value = "商铺id")
+ private Integer shopId;
}
--
Gitblit v1.7.1