Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

@@ -59,4 +59,7 @@

    public int updateForcePriceBySymbolAndMemberId(@Param("forcePrice") BigDecimal forcePrice, @Param("memberId") Long memberId, @Param("symbol") String symbol);

    public List<Long> selectMemberHasWholeOrder();

    int updateMemberAllHoldOrderClosingStatus(@Param("memberId") Long memberId);
}