From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java b/src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java
index 8b59599..761a86b 100644
--- a/src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java
@@ -1,5 +1,6 @@
package com.mzl.flower.dto.request.coupon;
+import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -7,7 +8,7 @@
@Data
public class QueryActivePointCouponDTO{
- @ApiModelProperty(value = "排序列 point desc / create_time desc,默认 create_time desc")
+ @ApiModelProperty(value = "排序列 point desc / create_time desc,默认 create_time desc",hidden = true)
private String orderStr;
@ApiModelProperty(value = "积分最小值")
@@ -22,5 +23,18 @@
@ApiModelProperty(value = "优惠券状态",hidden = true)
private String status;
+ /**
+ * 领取后有效类型（COUPON_usage_time_type）天、小时、分钟
+ */
+ @ApiModelProperty(value = "领取后有效类型（COUPON_USAGE_TIME_TYPE）")
+ @DictTrans(target = "usageTimeTypeName",codeType = "COUPON_USAGE_TIME_TYPE")
+ private String usageTimeType;
+
+ /**
+ * 领取后有效时间整数，比如90（天，小时，分钟）
+ */
+ @ApiModelProperty(value = "领取后有效时间整数")
+ private Integer usageTimeNum;
+
}
--
Gitblit v1.9.3