From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..e04b328 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 = "店铺营业额")
@@ -36,8 +35,17 @@
@ApiModelProperty(value = "剩余周期人数")
private Integer cycleSurp;
-
+
@ApiModelProperty(value = "剩余体验人数")
private Integer explorationSurp;
-
+
+ @ApiModelProperty(value = "领券1开2关")
+ private Integer platformCouponFlag;
+
+ @ApiModelProperty(value = "生日卡1开2关")
+ private Integer platformBirthdayFlag;
+
+ @ApiModelProperty(value = "待处理预约单数量")
+ private Integer unHandleReserve;
+
}
--
Gitblit v1.7.1