conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

@@ -31,4 +31,6 @@
     */
    private BigDecimal forceParam;

    private int messageReminder;

}