From 03331f46c05015df9debef834e752b2f9d13f9e0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 15:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java
index 7c0f020..3b0ec23 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java
@@ -1,38 +1,6 @@
 package com.ruoyi.account.api.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
-import java.math.BigDecimal;
-
-/**
- * @author zhibing.pu
- * @Date 2024/11/25 17:59
- */
-@Data
-@ApiModel
-public class CouponInfoVo {
-	@ApiModelProperty("优惠券id")
-	private Long id;
-	@ApiModelProperty("优惠券名称")
-	private String name;
-	@ApiModelProperty("优惠券类型 1=满减券,2=代金券,3=折扣券,4=商品券")
-	private Integer couponType;
-	@ApiModelProperty("满x元")
-	private BigDecimal conditionAmount;
-	@ApiModelProperty("减x元")
-	private BigDecimal discountAmount;
-	@ApiModelProperty("代金x元")
-	private BigDecimal moneyAmount;
-	@ApiModelProperty("折扣")
-	private BigDecimal discount;
-	@ApiModelProperty("有效期开始时间")
-	private String periodStartTime;
-	@ApiModelProperty("有效期结束时间")
-	private String periodEndTime;
-	@ApiModelProperty("是否可用")
-	private Boolean available;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

--
Gitblit v1.7.1