From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..19d6079 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,6 +1,5 @@
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;
@@ -17,6 +16,9 @@
@Data
public class MgtShopPageDto extends MgtPageDto {
+ @ApiModelProperty(value = "商户类型1经销商2代理商")
+ private Integer shopType ;
+
@ApiModelProperty(value = "搜索关键词")
private String keyword ;
@@ -30,7 +32,7 @@
private String shopAreaCode;
@ApiModelProperty(value = "签约时间")
- private Date signTime;
+ private String signTime;
@ApiModelProperty(value = "签约省code")
private String signProvinceCode;
@@ -59,7 +61,7 @@
@ApiModelProperty(value = "到期标记")
private Integer expireFlag;
- @ApiModelProperty(value = "商户标签")
+ @ApiModelProperty(value = "商户标签 多个,隔开")
private String shopTags;
@ApiModelProperty(value = "扶持能力1.有2.没有")
--
Gitblit v1.7.1