From 51de7e6b1a7b68c76b8dcb385013a0c06466b81c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 11:49:26 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java
index 28613f6..72db785 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java
@@ -1,10 +1,12 @@
package com.ruoyi.account.api.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.account.api.model.TAppUserCar;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -12,7 +14,10 @@
public class AppUserInfoDto {
@ApiModelProperty("1是0否")
private Integer isVip;
+ @ApiModelProperty("最低会员价格")
+ private BigDecimal minPrice;
@ApiModelProperty("vip结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime vipExpireTime;
@ApiModelProperty("当天是否签到")
private Integer isSign;
@@ -20,6 +25,8 @@
private Integer points;
@ApiModelProperty("当前优惠卷数量")
private Integer couponNum;
+ @ApiModelProperty("是否第一次添加车")
+ private Integer firstAdd;
@ApiModelProperty("当前绑定的车辆")
private List<TAppUserCar> userCars;
}
--
Gitblit v1.7.1