fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerNoticeEntity.java

@@ -15,11 +15,6 @@
public class FollowFollowerNoticeEntity extends BaseEntity {

    /**
     * 主键ID
     */
    private Long id;

    /**
     * 会员ID
     */
    private Long memberId;