From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java
index 08da17f..cbbe8b3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.shop.domain.vo;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,54 +19,83 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("签约时间")
+ @Excel(name = "签约时间", width = 30)
+ @ApiModelProperty(value="签约时间")
private String signTime;
- @ApiModelProperty("商户名称")
+ @Excel(name = "商户名称", width = 30)
+ @ApiModelProperty(value="商户名称")
private String shopName;
- @ApiModelProperty("商户编号")
+ @Excel(name = "商户编号", width = 30)
+ @ApiModelProperty(value="商户编号")
private String shopNumber;
- @ApiModelProperty("商户标签")
+ @Excel(name = "商户标签", width = 30)
+ @ApiModelProperty(value="商户标签")
private String shopTags;
- @ApiModelProperty("签约人")
+ @ApiModelProperty(value="签约人id")
+ private Long signUserId;
+
+ @Excel(name = "签约员工", width = 30)
+ @ApiModelProperty(value="签约员工")
private String signUser;
- @ApiModelProperty("首提金额")
+ @Excel(name = "首提金额", width = 30)
+ @ApiModelProperty(value="首提金额")
private BigDecimal firstWithdraw;
- @ApiModelProperty("关联员工")
- private BigDecimal belongUser;
+ @ApiModelProperty(value="关联员工id")
+ private Long belongUserId;
- @ApiModelProperty("关联部门")
- private BigDecimal belongDept;
+ @Excel(name = "关联员工", width = 30)
+ @ApiModelProperty(value="关联员工")
+ private String belongUser;
- @ApiModelProperty("来源渠道")
+ @Excel(name = "关联部门", width = 30)
+ @ApiModelProperty(value="关联部门")
+ private String belongDept;
+
+ @Excel(name = "来源渠道", width = 30)
+ @ApiModelProperty(value="来源渠道")
private String shopSource;
- @ApiModelProperty("签约区域")
+ @Excel(name = "签约区域", width = 30)
+ @ApiModelProperty(value="签约区域")
private String signAreaName;
- @ApiModelProperty("合作期限")
+ @Excel(name = "合作期限", width = 30)
+ @ApiModelProperty(value="合作期限")
private String cooperationTime;
- @ApiModelProperty("店铺地址")
+ @Excel(name = "店铺地址", width = 30)
+ @ApiModelProperty(value="店铺地址")
private String shopAddress;
- @ApiModelProperty("店主姓名")
+ @Excel(name = "店主姓名", width = 30)
+ @ApiModelProperty(value="店主姓名")
private String shopownerName;
- @ApiModelProperty("店主联系方式")
+ @Excel(name = "店主联系方式", width = 30)
+ @ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
+ @Excel(name = "商户状态", width = 30)
+ @ApiModelProperty(value="商户状态-1删除0冻结1正常2终止合作")
private String shopStatus;
- @ApiModelProperty("商户活动次数")
+ @Excel(name = "商户活动次数", width = 30)
+ @ApiModelProperty(value="商户活动次数")
private Integer shopActivityCount;
- @ApiModelProperty("店铺设置状态")
+ @Excel(name = "店铺设置状态", width = 30)
+ @ApiModelProperty(value="店铺设置状态")
private String shopCustomStatus;
+
+ @ApiModelProperty(value="冻结状态0解冻1冻结")
+ private Integer frozenFlag;
+
+ @ApiModelProperty(value="合作状态0终止1开启")
+ private Integer cooperativeFlag;
}
--
Gitblit v1.7.1