fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -10,5 +10,7 @@
public interface MemberSelectSymbolsDao extends BaseMapper<MemberSelectSymbolsEntity>{

   

   List<MemberSelectSymbolsEntity> selectSymbolByMemIdAndSymbol(@Param("memberId")Long memberId,@Param("symbol")String symbol);

	
   List<MemberSelectSymbolsEntity> selectSymbolByMemId(@Param("memberId")Long memberId);



}