From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001 From: zhanglin <852614290@qq.com> Date: 星期日, 23 七月 2023 16:04:35 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java index 99a56ab..9b7fd78 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java @@ -1,11 +1,9 @@ package com.ruoyi.system.api.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.List; /** * @author jqs34 @@ -29,7 +27,7 @@ @ApiModelProperty(value = "待处理订单") private Integer unHandleOrder; - @ApiModelProperty(value = "跟进任务") + @ApiModelProperty(value = "会员跟进任务") private Integer task; @ApiModelProperty(value = "店铺营业额") @@ -40,8 +38,5 @@ @ApiModelProperty(value = "剩余体验人数") private Integer explorationSurp; - - @ApiModelProperty(value = "多个商户id") - private List<Long> shopIds; } -- Gitblit v1.7.1