Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

@@ -22,4 +22,6 @@
    public List<ContractEntrustOrderEntity> selectAllEntrustOrder();

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

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