From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/ZhiyaRewardVo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/ZhiyaRewardVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/ZhiyaRewardVo.java
index 61f79be..b8eda60 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/ZhiyaRewardVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/ZhiyaRewardVo.java
@@ -17,6 +17,9 @@
*/
@ApiModelProperty(value = "质押编号")
private String recordNo;
+
+ @ApiModelProperty(value = "1:空白 2：返佣")
+ private Integer type;
/**
* 奖励金额
*/
--
Gitblit v1.9.1