From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 一月 2025 16:40:43 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 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..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,32 +18,30 @@ public class MgtMemberServiceRecordPageVo { - @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