From 06e4db5a576c63c10ab4673dba017ffe1a3e7e66 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 19:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/AppUserInfoDto.java |    8 ++++++++
 1 files changed, 8 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..ce10ebb 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", timezone = "GMT+8")
     private LocalDateTime vipExpireTime;
     @ApiModelProperty("当天是否签到")
     private Integer isSign;
@@ -20,6 +25,9 @@
     private Integer points;
     @ApiModelProperty("当前优惠卷数量")
     private Integer couponNum;
+    private Long vipCouponNum;
+    @ApiModelProperty("是否第一次添加车")
+    private Integer firstAdd;
     @ApiModelProperty("当前绑定的车辆")
     private List<TAppUserCar> userCars;
 }

--
Gitblit v1.7.1