fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java

@@ -22,4 +22,8 @@

    public static final String STOP_FOLLOW_CONTENT = "您已被交易员{}移除，已停止跟随此交易员下单";

    public static final String MONEY_NOT_ENOUGH_TITLE = "跟单-金额不足";

    public static final String MONEY_NOT_ENOUGH_CONTENT = "金额不足未能跟随交易员{}开仓";

}