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

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

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

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

}