From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java
index a8c8468..2f76d71 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java
@@ -18,7 +18,6 @@
public class MgtMemberServiceRecordPageVo {
- @Excel(name = "服务类型", width = 30)
@ApiModelProperty(value="服务类型1.周期2.服务3.体验")
private Integer serviceType;
@@ -30,12 +29,12 @@
@ApiModelProperty(value="服务商户id")
private Long shopId;
- @Excel(name = "服务商户", width = 30, sort = 2)
- @ApiModelProperty(value="服务商户")
+ @Excel(name = "服务店铺", width = 30, sort = 2)
+ @ApiModelProperty(value="服务店铺")
private String shopName;
- @Excel(name = "服务商品名称", width = 30, sort = 3)
- @ApiModelProperty(value="服务商品名称")
+ @Excel(name = "周期商品名称", width = 30, sort = 3)
+ @ApiModelProperty(value="周期商品名称")
private String consumerGoodsName;
@Excel(name = "服务次数", width = 30, sort = 4)
--
Gitblit v1.7.1