conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java

@@ -35,4 +35,8 @@
         @Param("record")MemberAccountMoneyChange memberAccountMoneyChange);



   IPage<UsdtToGusdVo> selectByMemberIdInPage(Page<UsdtToGusdVo> page, @Param("record")MemberAccountMoneyChange memberAccountMoneyChange);





   IPage<MemberAccountMoneyChange> coinInList(Page<MemberAccountMoneyChange> page,

                                    @Param("record")MemberAccountMoneyChange memberAccountMoneyChange);

}