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

zainali5120

2021-04-22 495e9dcc80d830d9da9ad677f5c245b5fc4cbfa6

 src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java

@@ -23,14 +23,10 @@
     */

    @ApiModelProperty(value = "主键ID")

    private Long id;

    /**

     * 跟随者ID

     */

    
    @ApiModelProperty(value = "跟随者ID")

    private Long memberId;

    /**

     * 跟随者ID

     */

    
    @ApiModelProperty(value = "交易者ID")

    private Long tradeId;