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/entity/ZhiyaRewardEntity.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiyaRewardEntity.java b/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiyaRewardEntity.java
index ef3a7d9..ba4d9fd 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiyaRewardEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiyaRewardEntity.java
@@ -34,5 +34,9 @@
* 奖励金额
*/
private BigDecimal rewardAmout;
+ /**
+ * 1：返回用户2：返回代理
+ */
+ private Integer type;
}
--
Gitblit v1.9.1