conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

 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;