From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 22 十一月 2023 19:33:58 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java index edb6926..f2671df 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java @@ -1,5 +1,6 @@ package com.dsh.activity.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,14 +10,17 @@ /** * 条件金额 */ - double conditionalAmount; + @ApiModelProperty("条件金额(例如 :满xx可用)") + String conditionalAmount; /** * 抵扣金额(代金券 取 该字段) */ - double deductionAmount; + @ApiModelProperty("抵扣金额(代金券 取 该字段) 例如:¥ xxx") + String deductionAmount; /** * 体验券名称 */ + @ApiModelProperty("体验券名称 ") String experienceName; } -- Gitblit v1.7.1