fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/documentary/dto/MyFollowOrderDto.java

@@ -20,12 +20,4 @@
    @ApiModelProperty(value = "每页数量", example = "10")

    private int pageSize;

    

    @NotNull

    @ApiModelProperty(value = "会员ID", example = "12543")

    private Long memberId;

    
    @NotNull

    @ApiModelProperty(value = "类型 1：当前跟单2：历史跟单", example = "1")

    private int orderType;



}