From 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 May 2021 14:34:00 +0800
Subject: [PATCH] conflect
---
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerProfitEntity.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerProfitEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerProfitEntity.java
index a428366..7221558 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerProfitEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerProfitEntity.java
@@ -20,10 +20,6 @@
public static final Integer IS_FOLLOW_N = 2;
/**
- * 主键ID
- */
- private Long id;
- /**
* 跟随者ID
*/
private Long memberId;
--
Gitblit v1.9.1