fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 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;