conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

@@ -10,7 +10,7 @@

public interface GbzOrderDao extends BaseMapper<GbzOrderEntity> {

    IPage<GbzOrderEntity> selectInPage(Page<GbzOrderEntity> page);
    IPage<GbzOrderEntity> selectInPage(@Param("record") GbzOrderEntity gbzOrderEntity, Page<GbzOrderEntity> page);

    BigDecimal selectOrderTotalAmount(@Param("memberId") Long memberId);