From 7c9dda6138ceea88a312583a3fcc9b2bb356fbc4 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期六, 05 八月 2023 09:37:54 +0800 Subject: [PATCH] bug和二维码 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberServiceRecordPageVo.java | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 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 f71b604..d55284c 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 @@ -1,6 +1,7 @@ package com.ruoyi.order.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,27 +18,32 @@ public class MgtMemberServiceRecordPageVo { - - - @ApiModelProperty("服务类型1.周期2.服务3.体验") + @Excel(name = "服务类型", width = 30) + @ApiModelProperty(value="服务类型1.周期2.服务3.体验") private Integer serviceType; - @ApiModelProperty("创建时间") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - @ApiModelProperty("服务商户id") + @Excel(name = "服务商户id", width = 30) + @ApiModelProperty(value="服务商户id") private Long shopId; - @ApiModelProperty("服务商户") + @Excel(name = "服务商户", width = 30) + @ApiModelProperty(value="服务商户") private String shopName; - @ApiModelProperty("服务商品名称") + @Excel(name = "服务商品名称", width = 30) + @ApiModelProperty(value="服务商品名称") private String consumerGoodsName; - @ApiModelProperty("服务次数") + @Excel(name = "服务次数", width = 30) + @ApiModelProperty(value="服务次数") private Integer serviceNum; - @ApiModelProperty("剩余次数") + @Excel(name = "剩余次数", width = 30) + @ApiModelProperty(value="剩余次数") private Integer surpNum; } -- Gitblit v1.7.1