Merge branch 'ty_urgent' into test

Helius

2020-12-27 862f4f0942da8033bf49af89eca0055ad8cb4730

 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java

@@ -84,5 +84,6 @@
   public Double  selectVipCardTotalMoney(@Param("vipId") Long vipId);


   List<MoneyCardUse> selectHasValidMoneyCardUse();
    
}