From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +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 |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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..07d0245 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,7 +1,7 @@
 package com.dsh.activity.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 
 
 @Data
@@ -9,14 +9,17 @@
     /**
      * 条件金额
      */
-    double conditionalAmount;
+    @ApiModelProperty("条件金额(例如 :满xx可用)")
+    String conditionalAmount;
     /**
      * 抵扣金额(代金券 取 该字段)
      */
-    double deductionAmount;
+    @ApiModelProperty("抵扣金额(代金券 取 该字段) 例如:¥ xxx")
+    String deductionAmount;
     /**
      * 体验券名称
      */
+    @ApiModelProperty("体验券名称 ")
     String experienceName;
 
 }

--
Gitblit v1.7.1