conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 src/main/java/com/xcong/excoin/modules/member/dao/MemberSettingDao.java

@@ -16,4 +16,5 @@

    public int batchInsert(@Param("list") List<MemberSettingEntity> list);

    public void updateMessageReminderByMemberId(@Param("memberId")Long memberId);
}