From 06272f6bb1002badb75f67d6c44a1b00bba32a76 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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 8a268ad..a8c8468 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
@@ -19,31 +19,30 @@
@Excel(name = "服务类型", width = 30)
- @ApiModelProperty("服务类型1.周期2.服务3.体验")
+ @ApiModelProperty(value="服务类型1.周期2.服务3.体验")
private Integer serviceType;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @Excel(name = "服务时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 1)
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @Excel(name = "服务商户id", width = 30)
- @ApiModelProperty("服务商户id")
+ @ApiModelProperty(value="服务商户id")
private Long shopId;
- @Excel(name = "服务商户", width = 30)
- @ApiModelProperty("服务商户")
+ @Excel(name = "服务商户", width = 30, sort = 2)
+ @ApiModelProperty(value="服务商户")
private String shopName;
- @Excel(name = "服务商品名称", width = 30)
- @ApiModelProperty("服务商品名称")
+ @Excel(name = "服务商品名称", width = 30, sort = 3)
+ @ApiModelProperty(value="服务商品名称")
private String consumerGoodsName;
- @Excel(name = "服务次数", width = 30)
- @ApiModelProperty("服务次数")
+ @Excel(name = "服务次数", width = 30, sort = 4)
+ @ApiModelProperty(value="服务次数")
private Integer serviceNum;
- @Excel(name = "剩余次数", width = 30)
- @ApiModelProperty("剩余次数")
+ @Excel(name = "剩余次数", width = 30, sort = 5)
+ @ApiModelProperty(value="剩余次数")
private Integer surpNum;
}
--
Gitblit v1.7.1