Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

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

@@ -81,6 +81,6 @@
     * 跟单状态 1：已跟单2：未跟单

     */

   @ApiModelProperty("跟单状态 1：已跟单2：未跟单")

    private Integer documentaaryType;

    private Integer documentaryType;



}