Merge branch 'ty_urgent' into api

Helius

2020-12-27 321d1fae7dbd5b399d8df3491ef60a8ea2575451

 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();
    
}