Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

 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;



}