From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 30 六月 2023 11:35:05 +0800 Subject: [PATCH] 联调bug和统计完善 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 fd0324a..2af483d 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 @@ -32,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; @@ -62,7 +62,7 @@ @ApiModelProperty(value = "到期标记") private Integer expireFlag; - @ApiModelProperty(value = "商户标签") + @ApiModelProperty(value = "商户标签 多个,隔开") private String shopTags; @ApiModelProperty(value = "扶持能力1.有2.没有") -- Gitblit v1.7.1