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

xiaoyong931011

2021-05-12 a65df41c3243877352fe6822b65c1836ddc3c19d

 src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java

@@ -16,6 +16,7 @@

    List<YdOrderEntity> selectNeedReturnOrders();

    List<YdOrderEntity> selectAllValidOrders();
    void UpdateByIdAndState(@Param("id")Long id, @Param("state")int state);

    YdOrderVo selectOrderByMemberIdAndId(@Param("memberId")Long memberId, @Param("id")Long id);