Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-06 87c7037e167ba94e858c4ae7a1d1870c4128b775

 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;