Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-28 ffca7fc095a9111837dfd82288faef450b749f69

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

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

}