Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-25 a55747a7cedc4c4f04f33755a27862c959c1ad30

 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;