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

xiaoyong931011

2021-03-26 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e

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

@@ -20,4 +20,8 @@
    public List<ContractEntrustOrderEntity> selectEntrustOrderListByIds(@Param("list") List<Long> list);

    public List<ContractEntrustOrderEntity> selectAllEntrustOrder();

    public List<ContractEntrustOrderEntity> selectMemberEntrustOrderByPositionType(@Param("positionType") Integer positionType, @Param("memberId") Long memberId);

    public List<ContractEntrustOrderEntity> selectEntrustOrderByOrderNo(@Param("orderNo") String orderNo);
}