From 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Sep 2020 03:23:52 +0800
Subject: [PATCH] fix conflicts
---
src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java
index 468a910..4cefe1a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java
@@ -29,6 +29,16 @@
*/
public static final int ORDER_TYPE_HOLD = 3;
+ /**
+ * 是否已返佣 0-否
+ */
+ public static final int IS_RETURN_N = 0;
+
+ /**
+ * 是否已返佣 1-是
+ */
+ public static final int IS_RETURN_Y = 1;
+
private Long memberId;
private Long orderId;
--
Gitblit v1.9.1