From fd7bde636229e0d293add3fc8241b2679fa71639 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 27 九月 2023 15:26:06 +0800
Subject: [PATCH] 活动商品搜索bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 79c1546..2668b19 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,6 +1,5 @@
package com.ruoyi.system.api.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,7 +18,7 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户类型1.经销商2.代理商")
+ @ApiModelProperty(value="商户类型1.经销商2.代理商")
private Integer shopType;
@ApiModelProperty(value = "今日到店")
@@ -28,7 +27,7 @@
@ApiModelProperty(value = "待处理订单")
private Integer unHandleOrder;
- @ApiModelProperty(value = "跟进任务")
+ @ApiModelProperty(value = "会员跟进任务")
private Integer task;
@ApiModelProperty(value = "店铺营业额")
@@ -40,4 +39,10 @@
@ApiModelProperty(value = "剩余体验人数")
private Integer explorationSurp;
+ @ApiModelProperty(value = "领券1开2关")
+ private Integer platformCouponFlag;
+
+ @ApiModelProperty(value = "生日卡1开2关")
+ private Integer platformBirthdayFlag;
+
}
--
Gitblit v1.7.1