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

xiaoyong931011

2021-05-26 a0da4723b75c2bb13d2b4bef8fed196c678ddcde

 src/main/java/com/xcong/excoin/modules/member/entity/MemberSettingEntity.java

@@ -30,5 +30,9 @@
     * 强平系数
     */
    private BigDecimal forceParam;
    /**
     * 跟单消息提醒0:没有  1：有
     */
    private Integer messageReminder;

}