From ec09e9f2c72ff37654076c327008ac89ed32a8c3 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期六, 24 六月 2023 17:44:11 +0800
Subject: [PATCH] 导入导出

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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..d156e0d 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,71 @@
     @ApiModelProperty(value = "商户id")
     private Long shopId;
 
+    @Excel(name = "签约时间", width = 30)
     @ApiModelProperty("签约时间")
     private String signTime;
 
+    @Excel(name = "商户名称", width = 30)
     @ApiModelProperty("商户名称")
     private String shopName;
 
+    @Excel(name = "商户编号", width = 30)
     @ApiModelProperty("商户编号")
     private String shopNumber;
 
+    @Excel(name = "商户标签", width = 30)
     @ApiModelProperty("商户标签")
     private String shopTags;
 
+    @Excel(name = "签约人", width = 30)
     @ApiModelProperty("签约人")
     private String signUser;
 
+    @Excel(name = "首提金额", width = 30)
     @ApiModelProperty("首提金额")
     private BigDecimal firstWithdraw;
 
+    @Excel(name = "关联员工", width = 30)
     @ApiModelProperty("关联员工")
-    private BigDecimal belongUser;
+    private String belongUser;
 
+    @Excel(name = "关联部门", width = 30)
     @ApiModelProperty("关联部门")
-    private BigDecimal belongDept;
+    private String belongDept;
 
+    @Excel(name = "来源渠道", width = 30)
     @ApiModelProperty("来源渠道")
     private String shopSource;
 
+    @Excel(name = "签约区域", width = 30)
     @ApiModelProperty("签约区域")
     private String signAreaName;
 
+    @Excel(name = "合作期限", width = 30)
     @ApiModelProperty("合作期限")
     private String cooperationTime;
 
+    @Excel(name = "店铺地址", width = 30)
     @ApiModelProperty("店铺地址")
     private String shopAddress;
 
+    @Excel(name = "店主姓名", width = 30)
     @ApiModelProperty("店主姓名")
     private String shopownerName;
 
+    @Excel(name = "店主联系方式", width = 30)
     @ApiModelProperty("店主联系方式")
     private String shopownerPhone;
 
+    @Excel(name = "商户状态", width = 30)
     @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
     private String shopStatus;
 
+    @Excel(name = "商户活动次数", width = 30)
     @ApiModelProperty("商户活动次数")
     private Integer shopActivityCount;
 
+    @Excel(name = "店铺设置状态", width = 30)
     @ApiModelProperty("店铺设置状态")
     private String shopCustomStatus;
 }

--
Gitblit v1.7.1