From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopPageVo.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 cbbe8b3..3ea76c0 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
@@ -19,78 +19,82 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @Excel(name = "签约时间", width = 30)
+ @Excel(name = "签约时间", width = 30, sort = 1)
@ApiModelProperty(value="签约时间")
private String signTime;
- @Excel(name = "商户名称", width = 30)
- @ApiModelProperty(value="商户名称")
+ @Excel(name = "店铺名称", width = 30, sort = 9)
+ @ApiModelProperty(value="店铺名称")
private String shopName;
- @Excel(name = "商户编号", width = 30)
+ @Excel(name = "店铺编号", width = 30, sort = 2)
@ApiModelProperty(value="商户编号")
private String shopNumber;
- @Excel(name = "商户标签", width = 30)
- @ApiModelProperty(value="商户标签")
+ @Excel(name = "店铺标签", width = 30, sort = 3)
+ @ApiModelProperty(value="店铺标签")
private String shopTags;
@ApiModelProperty(value="签约人id")
private Long signUserId;
- @Excel(name = "签约员工", width = 30)
+ @Excel(name = "签约员工", width = 30, sort = 4)
@ApiModelProperty(value="签约员工")
private String signUser;
- @Excel(name = "首提金额", width = 30)
+ @Excel(name = "首提金额", width = 30, sort = 5)
@ApiModelProperty(value="首提金额")
private BigDecimal firstWithdraw;
@ApiModelProperty(value="关联员工id")
private Long belongUserId;
- @Excel(name = "关联员工", width = 30)
+ @Excel(name = "关联员工", width = 30, sort = 6)
@ApiModelProperty(value="关联员工")
private String belongUser;
- @Excel(name = "关联部门", width = 30)
+ @Excel(name = "所属部门", width = 30, sort = 7)
@ApiModelProperty(value="关联部门")
private String belongDept;
- @Excel(name = "来源渠道", width = 30)
+ @Excel(name = "来源渠道", width = 30, sort = 8)
@ApiModelProperty(value="来源渠道")
private String shopSource;
- @Excel(name = "签约区域", width = 30)
+ @Excel(name = "签约区域", width = 30, sort = 10)
@ApiModelProperty(value="签约区域")
private String signAreaName;
- @Excel(name = "合作期限", width = 30)
+ @Excel(name = "合作期限", width = 30, sort = 11)
@ApiModelProperty(value="合作期限")
private String cooperationTime;
- @Excel(name = "店铺地址", width = 30)
+ @Excel(name = "是否到期", width = 30, sort = 12)
+ @ApiModelProperty(value="是否到期")
+ private String deadlineFlag;
+
+ @Excel(name = "店铺地址", width = 30, sort = 13)
@ApiModelProperty(value="店铺地址")
private String shopAddress;
- @Excel(name = "店主姓名", width = 30)
- @ApiModelProperty(value="店主姓名")
+ @Excel(name = "店长", width = 30, sort = 14)
+ @ApiModelProperty(value="店长")
private String shopownerName;
- @Excel(name = "店主联系方式", width = 30)
- @ApiModelProperty(value="店主联系方式")
+ @Excel(name = "店长联系方式", width = 30, sort = 15)
+ @ApiModelProperty(value="店长联系方式")
private String shopownerPhone;
- @Excel(name = "商户状态", width = 30)
+ @Excel(name = "状态", width = 30, sort = 18)
@ApiModelProperty(value="商户状态-1删除0冻结1正常2终止合作")
private String shopStatus;
- @Excel(name = "商户活动次数", width = 30)
- @ApiModelProperty(value="商户活动次数")
+ @Excel(name = "店铺活动次数", width = 30, sort = 17)
+ @ApiModelProperty(value="店铺活动次数")
private Integer shopActivityCount;
- @Excel(name = "店铺设置状态", width = 30)
- @ApiModelProperty(value="店铺设置状态")
+ @Excel(name = "店铺状态", width = 30, sort = 16)
+ @ApiModelProperty(value="店铺状态")
private String shopCustomStatus;
@ApiModelProperty(value="冻结状态0解冻1冻结")
--
Gitblit v1.7.1