From f95df31ceef45cf6486a1bf5be90e5e4075fdb1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 01 Jun 2021 17:21:13 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
index fc8f1f7..b3795a9 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityReceiveRecordVo.java
@@ -23,7 +23,7 @@
private BigDecimal subAmount;
@ApiModelProperty("条件")
private String subConditions;
- @ApiModelProperty("激活状态1已激活2未激活3已领取")
+ @ApiModelProperty("激活状态1已激活2未激活3已失效")
private Integer receiveState;
@JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("失效时间")
--
Gitblit v1.9.1