Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-16 17b569ed8554e755c9e5feedf6e7882cdf2c8d01

 src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java

@@ -40,6 +40,7 @@
    public List<ContractHoldOrderEntity> selectHoldOrderListByMemberId(@Param("memberId") Long memberId);

    public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol, @Param("type") Integer type);
    public List<ContractHoldOrderEntity> selectHoldOrderListByMemberIdAndSymbolTest(@Param("memberId") Long memberId, @Param("type") Integer type);

    public ContractHoldOrderEntity selectHoldOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);